root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x 

Closes gh-22155
This commit is contained in:
Madhura Bhave 2020-06-29 17:08:37 -07:00
parent affb2da07a 9c732fa2b6
commit f19f2b8714
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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