Browse Source

Prevent NPE in AbstractApplicationEventMulticaster's non-caching code path

Issue: SPR-12545
(cherry picked from commit 1cefeb2)
pull/733/head
Juergen Hoeller 11 years ago
parent
commit
8e14a5d640
  1. 8
      spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java

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

@ -200,7 +200,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);
} }
} }
@ -213,7 +215,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);
} }
} }

Loading…
Cancel
Save