Skip to content

Simplify logic in ErrorPage's equals method #22082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Simplify logic in ErrorPage's equals method #22082

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1703007
condition is always true
Jun 24, 2020
9d2793e
Simplify code: Incorporate Boolean conditions appropriately
Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public boolean equals(Object obj) {
if (obj instanceof ErrorPage) {
ErrorPage other = (ErrorPage) obj;
boolean rtn = true;
rtn = rtn && ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName());
rtn = ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName());
Copy link
Member

@wilkinsona wilkinsona Jun 24, 2020

Choose a reason for hiding this comment

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

Thanks for the suggestion. Rather than assigning rtn on 117 and then again on line 118, the two could be combined:

boolean rtn = ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName());

Copy link
Author

@ghost ghost Jun 24, 2020

Choose a reason for hiding this comment

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

@wilkinsona Thank you for your instruction. I have resubmitted it：
9d2793e

rtn = rtn && ObjectUtils.nullSafeEquals(this.path, other.path);
rtn = rtn && this.status == other.status;
return rtn;
Expand Down