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

Destroy singleton instead of removing and re-registering bean definition

Browse Source
This commit is contained in:
Sam Brannen
2024-10-03 16:39:10 +02:00
parent 39a27256a7
commit 02094b258c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanFactoryPostProcessor.java
View File

@@ -33,6 +33,7 @@ import org.springframework.beans.factory.config.DependencyDescriptor;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.core.Ordered;
import org.springframework.core.ResolvableType;
@@ -142,14 +143,9 @@ class BeanOverrideBeanFactoryPostProcessor implements BeanFactoryPostProcessor,
beanNameIncludingFactory = beanName;
}
// Process existing bean definition.
if (existingBeanDefinition != null) {
// Validate existing bean definition.
validateBeanDefinition(beanFactory, beanName);
// Since validation may have registered a singleton as a side effect -- for example,
// for a FactoryBean -- we need to remove the bean definition (which removes the
// singleton as a side effect) and re-register the bean definition.
registry.removeBeanDefinition(beanName);
registry.registerBeanDefinition(beanName, existingBeanDefinition);
}
else {
// There was no existing bean definition, so we register the pseudo bean definition
@@ -293,6 +289,13 @@ class BeanOverrideBeanFactoryPostProcessor implements BeanFactoryPostProcessor,
private static void validateBeanDefinition(ConfigurableListableBeanFactory beanFactory, String beanName) {
Assert.state(beanFactory.isSingleton(beanName),
() -> "Unable to override bean '" + beanName + "': only singleton beans can be overridden.");
// Since the isSingleton() check above may have registered a singleton as a side
// effect -- for example, for a FactoryBean -- we need to destroy the singleton,
// because we later manually register a bean override instance as a singleton.
if (beanFactory instanceof DefaultListableBeanFactory dlbf) {
dlbf.destroySingleton(beanName);
}
}
}