AbstractApplicationContext silently ignores non-initialized ApplicationEventMulticaster/LifecycleProcessor on destruction
Issue: SPR-16149
This commit is contained in:
@@ -387,7 +387,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
|
||||
else {
|
||||
applicationEvent = new PayloadApplicationEvent<>(this, event);
|
||||
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.
|
||||
try {
|
||||
getLifecycleProcessor().onClose();
|
||||
}
|
||||
catch (Throwable ex) {
|
||||
logger.warn("Exception thrown from LifecycleProcessor on context close", ex);
|
||||
if (this.lifecycleProcessor != null) {
|
||||
try {
|
||||
this.lifecycleProcessor.onClose();
|
||||
}
|
||||
catch (Throwable ex) {
|
||||
logger.warn("Exception thrown from LifecycleProcessor on context close", ex);
|
||||
}
|
||||
}
|
||||
|
||||
// Destroy all cached singletons in the context's BeanFactory.
|
||||
|
||||
@@ -92,9 +92,14 @@ class ApplicationListenerDetector implements DestructionAwareBeanPostProcessor,
|
||||
@Override
|
||||
public void postProcessBeforeDestruction(Object bean, String beanName) {
|
||||
if (bean instanceof ApplicationListener) {
|
||||
ApplicationEventMulticaster multicaster = this.applicationContext.getApplicationEventMulticaster();
|
||||
multicaster.removeApplicationListener((ApplicationListener<?>) bean);
|
||||
multicaster.removeApplicationListenerBean(beanName);
|
||||
try {
|
||||
ApplicationEventMulticaster multicaster = this.applicationContext.getApplicationEventMulticaster();
|
||||
multicaster.removeApplicationListener((ApplicationListener<?>) bean);
|
||||
multicaster.removeApplicationListenerBean(beanName);
|
||||
}
|
||||
catch (IllegalStateException ex) {
|
||||
// ApplicationEventMulticaster not initialized yet - no need to remove a listener
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user