Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent NPE in AbstractApplicationEventMulticaster's non-caching code path

Browse Source 
Issue: SPR-12545
This commit is contained in:
Juergen Hoeller
2014-12-30 10:01:58 +01:00
parent 51367dec05
commit 1cefeb2af0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
View File

@@ -199,7 +199,9 @@ public abstract class AbstractApplicationEventMulticaster
} }
for (ApplicationListener<?> listener : listeners) { for (ApplicationListener<?> listener : listeners) {
if (supportsEvent(listener, event.getClass(), sourceType)) { if (supportsEvent(listener, event.getClass(), sourceType)) {
retriever.applicationListeners.add(listener); if (retriever != null) {
retriever.applicationListeners.add(listener);
}
allListeners.add(listener); allListeners.add(listener);
} }
} }
@@ -212,7 +214,9 @@ public abstract class AbstractApplicationEventMulticaster
ApplicationListener<?> listener = ApplicationListener<?> listener =
beanFactory.getBean(listenerBeanName, ApplicationListener.class); beanFactory.getBean(listenerBeanName, ApplicationListener.class);
if (!allListeners.contains(listener) && supportsEvent(listener, event.getClass(), sourceType)) { if (!allListeners.contains(listener) && supportsEvent(listener, event.getClass(), sourceType)) {
retriever.applicationListenerBeans.add(listenerBeanName); if (retriever != null) {
retriever.applicationListenerBeans.add(listenerBeanName);
}
allListeners.add(listener); allListeners.add(listener);
} }
} }