No warn logging for propagated original exception

jhoeller · jhoeller · commit 96bfc14dba76 · 2016-11-22T16:00:23.000+01:00
Issue: SPR-14907
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
@@ -381,9 +381,12 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques
 			}
 		}
 		catch (Throwable invocationEx) {
-			if (logger.isWarnEnabled()) {
+			// Any other than the original exception is unintended here,
+			// probably an accident (e.g. failed assertion or the like).
+			if (invocationEx != exception && logger.isWarnEnabled()) {
 				logger.warn("Failed to invoke @ExceptionHandler method: " + exceptionHandlerMethod, invocationEx);
 			}
+			// Continue with default processing of the original exception...
 			return null;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -381,9 +381,12 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`	`catch (Throwable invocationEx) {`
`384`		`- if (logger.isWarnEnabled()) {`
	`384`	`+ // Any other than the original exception is unintended here,`
	`385`	`+ // probably an accident (e.g. failed assertion or the like).`
	`386`	`+ if (invocationEx != exception && logger.isWarnEnabled()) {`
`385`	`387`	`logger.warn("Failed to invoke @ExceptionHandler method: " + exceptionHandlerMethod, invocationEx);`
`386`	`388`	`}`
	`389`	`+ // Continue with default processing of the original exception...`
`387`	`390`	`return null;`
`388`	`391`	`}`
`389`	`392`