Prevent NPE in AbstractApplicationEventMulticaster's non-caching code path

Issue: SPR-12545
master
Juergen Hoeller 10 years ago
parent 51367dec05
commit 1cefeb2af0
  1. 8
      spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java

@ -199,7 +199,9 @@ public abstract class AbstractApplicationEventMulticaster
}
for (ApplicationListener<?> listener : listeners) {
if (supportsEvent(listener, event.getClass(), sourceType)) {
retriever.applicationListeners.add(listener);
if (retriever != null) {
retriever.applicationListeners.add(listener);
}
allListeners.add(listener);
}
}
@ -212,7 +214,9 @@ public abstract class AbstractApplicationEventMulticaster
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);
}
}

Loading…
Cancel
Save