SimpleApplicationEventMulticaster defensively swallows ClassCastException without message

jhoeller · jhoeller · commit 976d32fc5943 · 2017-01-17T20:37:20.000+01:00
Issue: SPR-15145
diff --git a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
@@ -168,7 +168,7 @@ protected void invokeListener(ApplicationListener listener, ApplicationEvent eve
 			}
 			catch (ClassCastException ex) {
 				String msg = ex.getMessage();
-				if (msg != null && msg.startsWith(event.getClass().getName())) {
+				if (msg == null || msg.startsWith(event.getClass().getName())) {
 					// Possibly a lambda-defined listener which we could not resolve the generic event type for
 					Log logger = LogFactory.getLog(getClass());
 					if (logger.isDebugEnabled()) {

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ protected void invokeListener(ApplicationListener listener, ApplicationEvent eve`
`168`	`168`	`}`
`169`	`169`	`catch (ClassCastException ex) {`
`170`	`170`	`String msg = ex.getMessage();`
`171`		`- if (msg != null && msg.startsWith(event.getClass().getName())) {`
	`171`	`+ if (msg == null \|\| msg.startsWith(event.getClass().getName())) {`
`172`	`172`	`// Possibly a lambda-defined listener which we could not resolve the generic event type for`
`173`	`173`	`Log logger = LogFactory.getLog(getClass());`
`174`	`174`	`if (logger.isDebugEnabled()) {`