Merge branch '2.3.x'

Closes gh-22156
4 years ago · 255f8197ab
parent 7de3d079f2 f19f2b8714
commit 255f8197ab
1 changed files with 1 additions and 2 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPage.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPage.java
@ -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;