Merge branch '2.3.x'

Closes gh-22156
spring-projects · Jun 30, 2020 · 255f819 · 255f819
2 parents 7de3d07 + f19f2b8
commit 255f819
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPage.java b/...boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPage.java
@@ -114,8 +114,7 @@ public boolean equals(Object obj) {
 		}
 		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;