Prevent NPE in AbstractApplicationEventMulticaster's non-caching code path

jhoeller · jhoeller · commit 8e14a5d64075 · 2014-12-30T10:08:42.000+01:00
Issue: SPR-12545 (cherry picked from commit 1cefeb2)
diff --git a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
@@ -200,7 +200,9 @@ private Collection<ApplicationListener<?>> retrieveApplicationListeners(
 		}
 		for (ApplicationListener<?> listener : listeners) {
 			if (supportsEvent(listener, event.getClass(), sourceType)) {
-				retriever.applicationListeners.add(listener);
+				if (retriever != null) {
+					retriever.applicationListeners.add(listener);
+				}
 				allListeners.add(listener);
 			}
 		}
@@ -213,7 +215,9 @@ private Collection<ApplicationListener<?>> retrieveApplicationListeners(
 						ApplicationListener<?> listener =
 								beanFactory.getBean(listenerBeanName, ApplicationListener.class);
 						if (!allListeners.contains(listener) && supportsEvent(listener, event.getClass(), sourceType)) {
-							retriever.applicationListenerBeans.add(listenerBeanName);
+							if (retriever != null) {
+								retriever.applicationListenerBeans.add(listenerBeanName);
+							}
 							allListeners.add(listener);
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,9 @@ private Collection<ApplicationListener<?>> retrieveApplicationListeners(`
`200`	`200`	`}`
`201`	`201`	`for (ApplicationListener<?> listener : listeners) {`
`202`	`202`	`if (supportsEvent(listener, event.getClass(), sourceType)) {`
`203`		`- retriever.applicationListeners.add(listener);`
	`203`	`+ if (retriever != null) {`
	`204`	`+ retriever.applicationListeners.add(listener);`
	`205`	`+ }`
`204`	`206`	`allListeners.add(listener);`
`205`	`207`	`}`
`206`	`208`	`}`
`@@ -213,7 +215,9 @@ private Collection<ApplicationListener<?>> retrieveApplicationListeners(`
`213`	`215`	`ApplicationListener<?> listener =`
`214`	`216`	`beanFactory.getBean(listenerBeanName, ApplicationListener.class);`
`215`	`217`	`if (!allListeners.contains(listener) && supportsEvent(listener, event.getClass(), sourceType)) {`
`216`		`- retriever.applicationListenerBeans.add(listenerBeanName);`
	`218`	`+ if (retriever != null) {`
	`219`	`+ retriever.applicationListenerBeans.add(listenerBeanName);`
	`220`	`+ }`
`217`	`221`	`allListeners.add(listener);`
`218`	`222`	`}`
`219`	`223`	`}`