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

AbstractApplicationContext silently ignores non-initialized ApplicationEventMulticaster/LifecycleProcessor on destruction

Browse Source 
Issue: SPR-16149
This commit is contained in:
Juergen Hoeller
2017-11-02 16:07:12 +01:00
parent d00e4f17ec
commit 1611ce7180
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
View File

@@ -387,7 +387,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
else { else {
applicationEvent = new PayloadApplicationEvent<>(this, event); applicationEvent = new PayloadApplicationEvent<>(this, event);
if (eventType == null) { if (eventType == null) {
eventType = ((PayloadApplicationEvent)applicationEvent).getResolvableType(); eventType = ((PayloadApplicationEvent) applicationEvent).getResolvableType();
} }
} }
@@ -1000,11 +1000,13 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
} }
// Stop all Lifecycle beans, to avoid delays during individual destruction. // Stop all Lifecycle beans, to avoid delays during individual destruction.
try { if (this.lifecycleProcessor != null) {
getLifecycleProcessor().onClose(); try {
} this.lifecycleProcessor.onClose();
catch (Throwable ex) { }
logger.warn("Exception thrown from LifecycleProcessor on context close", ex); catch (Throwable ex) {
logger.warn("Exception thrown from LifecycleProcessor on context close", ex);
}
} }
// Destroy all cached singletons in the context's BeanFactory. // Destroy all cached singletons in the context's BeanFactory.

11
spring-context/src/main/java/org/springframework/context/support/ApplicationListenerDetector.java
View File

@@ -92,9 +92,14 @@ class ApplicationListenerDetector implements DestructionAwareBeanPostProcessor,
@Override @Override
public void postProcessBeforeDestruction(Object bean, String beanName) { public void postProcessBeforeDestruction(Object bean, String beanName) {
if (bean instanceof ApplicationListener) { if (bean instanceof ApplicationListener) {
ApplicationEventMulticaster multicaster = this.applicationContext.getApplicationEventMulticaster(); try {
multicaster.removeApplicationListener((ApplicationListener<?>) bean); ApplicationEventMulticaster multicaster = this.applicationContext.getApplicationEventMulticaster();
multicaster.removeApplicationListenerBean(beanName); multicaster.removeApplicationListener((ApplicationListener<?>) bean);
multicaster.removeApplicationListenerBean(beanName);
}
catch (IllegalStateException ex) {
// ApplicationEventMulticaster not initialized yet - no need to remove a listener
}
} }
} }