Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22240 from izeye

Browse Source 
* pr/22240:
  Polish ErrorPage.equals()

Closes gh-22240
This commit is contained in:
Stephane Nicoll
2020-07-07 14:01:37 +02:00
parent 247fd59422 4ab4c61761
commit 14c80c73c8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPage.java
View File

@@ -114,10 +114,8 @@ public class ErrorPage {
}
if (obj instanceof ErrorPage) {
ErrorPage other = (ErrorPage) obj;
boolean rtn = ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName());
rtn = rtn && ObjectUtils.nullSafeEquals(this.path, other.path);
rtn = rtn && this.status == other.status;
return rtn;
return ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName())
&& ObjectUtils.nullSafeEquals(this.path, other.path) && this.status == other.status;
}
return false;
}