Skip to content

fixes setting paramName only when it is not null - #6332

Merged
rwinch merged 1 commit into
spring-projects:masterfrom
ankurpathak:gh-17565-npe
Jan 10, 2019
Merged

rwinch merged 1 commit into
spring-projects:masterfrom
ankurpathak:gh-17565-npe

Conversation

@ankurpathak

@ankurpathak ankurpathak commented Dec 24, 2018 •

Copy link
Copy Markdown
Contributor

Fixes: gh-6223

@rwinch rwinch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR @ankurpathak! I have provided feedback inline.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add { to follow Spring Security's code conventions

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added { to if part.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add it for else part as well??

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. We do not use implied { for one line statements

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added for else part as well.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the test below to work, you need to remove super.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed super.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please rename to lookupVariableWhenParameterNameNullThenNotSet

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed test to lookupVariableWhenParameterNameNullThenNotSet

@ankurpathak
ankurpathak force-pushed the gh-17565-npe branch 3 times, most recently from e6a0212 to dad649d Compare January 9, 2019 02:27

@rwinch rwinch left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that the commit references an invalid ticket. Can you update it to be Fixes: gh-6223?

@ankurpathak

Copy link
Copy Markdown
Contributor Author

changed commit message to reflect Fixes: gh-6223.

@rwinch rwinch self-assigned this Jan 10, 2019
@rwinch rwinch added type: bug A general bug in: core An issue in spring-security-core status: duplicate A duplicate of another issue labels Jan 10, 2019
@rwinch rwinch added this to the 5.2.0.M1 milestone Jan 10, 2019
@rwinch
rwinch merged commit 4ff5149 into spring-projects:master Jan 10, 2019
@rwinch

rwinch commented Jan 10, 2019

Copy link
Copy Markdown
Member

Thanks @ankurpathak! This is now merged into master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

in: core An issue in spring-security-core status: duplicate A duplicate of another issue type: bug A general bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants