Do not warn also if cause is re-thrown

rstoyanchev · rstoyanchev · commit 157df861f94d · 2019-07-05T07:07:59.000+01:00
Closes gh-23233
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
@@ -407,9 +407,9 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques
 			}
 		}
 		catch (Throwable invocationEx) {
-			// Any other than the original exception is unintended here,
+			// Any other than the original exception (or its cause) is unintended here,
 			// probably an accident (e.g. failed assertion or the like).
-			if (invocationEx != exception && logger.isWarnEnabled()) {
+			if (invocationEx != exception && invocationEx != exception.getCause() && logger.isWarnEnabled()) {
 				logger.warn("Failure in @ExceptionHandler " + exceptionHandlerMethod, invocationEx);
 			}
 			// Continue with default processing of the original exception...

Original file line number	Diff line number	Diff line change
`@@ -407,9 +407,9 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`	`catch (Throwable invocationEx) {`
`410`		`- // Any other than the original exception is unintended here,`
	`410`	`+ // Any other than the original exception (or its cause) is unintended here,`
`411`	`411`	`// probably an accident (e.g. failed assertion or the like).`
`412`		`- if (invocationEx != exception && logger.isWarnEnabled()) {`
	`412`	`+ if (invocationEx != exception && invocationEx != exception.getCause() && logger.isWarnEnabled()) {`
`413`	`413`	`logger.warn("Failure in @ExceptionHandler " + exceptionHandlerMethod, invocationEx);`
`414`	`414`	`}`
`415`	`415`	`// Continue with default processing of the original exception...`