root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ApplicationListenerDetector explicitly prevents serialization of its ApplicationContext reference 

Issue: SPR-14214
This commit is contained in:
Juergen Hoeller 2016-04-27 21:30:46 +02:00
parent 6ab8d36ed0
commit e0734aede8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -344,17 +344,23 @@ class PostProcessorRegistrationDelegate {
/** /**
* BeanPostProcessor that detects beans which implement the ApplicationListener interface. * {@code BeanPostProcessor} that detects beans which implement the {@code ApplicationListener}
* This catches beans that can't reliably be detected by getBeanNamesForType. * interface. This catches beans that can't reliably be detected by {@code getBeanNamesForType}
* and related operations which only work against top-level beans.
*
* <p>With standard Java serialization, this post-processor won't get serialized as part of
* {@code DisposableBeanAdapter} to begin with. However, with alternative serialization
* mechanisms, {@code DisposableBeanAdapter.writeReplace} might not get used at all, so we
* defensively mark this post-processor's field state as {@code transient}.
*/ */
private static class ApplicationListenerDetector private static class ApplicationListenerDetector
implements DestructionAwareBeanPostProcessor, MergedBeanDefinitionPostProcessor { implements DestructionAwareBeanPostProcessor, MergedBeanDefinitionPostProcessor {
private static final Log logger = LogFactory.getLog(ApplicationListenerDetector.class); private static final Log logger = LogFactory.getLog(ApplicationListenerDetector.class);
private final AbstractApplicationContext applicationContext; private transient final AbstractApplicationContext applicationContext;
private final Map<String, Boolean> singletonNames = new ConcurrentHashMap<String, Boolean>(256); private transient final Map<String, Boolean> singletonNames = new ConcurrentHashMap<String, Boolean>(256);
public ApplicationListenerDetector(AbstractApplicationContext applicationContext) { public ApplicationListenerDetector(AbstractApplicationContext applicationContext) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
@ -362,7 +368,7 @@ class PostProcessorRegistrationDelegate {
@Override @Override
public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) { public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
if (beanDefinition.isSingleton()) { if (this.applicationContext != null && beanDefinition.isSingleton()) {
this.singletonNames.put(beanName, Boolean.TRUE); this.singletonNames.put(beanName, Boolean.TRUE);
} }
} }
@ -374,7 +380,7 @@ class PostProcessorRegistrationDelegate {
@Override @Override
public Object postProcessAfterInitialization(Object bean, String beanName) { public Object postProcessAfterInitialization(Object bean, String beanName) {
if (bean instanceof ApplicationListener) { if (this.applicationContext != null && bean instanceof ApplicationListener) {
// potentially not detected as a listener by getBeanNamesForType retrieval // potentially not detected as a listener by getBeanNamesForType retrieval
Boolean flag = this.singletonNames.get(beanName); Boolean flag = this.singletonNames.get(beanName);
if (Boolean.TRUE.equals(flag)) { if (Boolean.TRUE.equals(flag)) {