Merge branch '2.3.x'

Closes gh-22156

Merge branch '2.3.x'
Closes gh-22156
255f8197 · Madhura Bhave · 7de3d079 · f19f2b87 · 255f8197
Commit 255f8197 authored Jun 30, 2020 by Madhura Bhave
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

ErrorPage.java ...n/java/org/springframework/boot/web/server/ErrorPage.java +1 -2

No files found.
--- 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;
+			boolean rtn = ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName());
-			rtn = rtn && ObjectUtils.nullSafeEquals(getExceptionName(), other.getExceptionName());
 			rtn = rtn && ObjectUtils.nullSafeEquals(this.path, other.path);
 			rtn = rtn && this.status == other.status;
 			return rtn;