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

call processConfigBeanDefinitions lazily if postProcessBeanDefinitionRegistry hasn't been called

Browse Source
This commit is contained in:
Juergen Hoeller
2010-01-31 16:10:11 +00:00
parent b53ccb3807
commit 83c018a0b4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
View File

@@ -80,6 +80,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
private boolean setMetadataReaderFactoryCalled = false; private boolean setMetadataReaderFactoryCalled = false;
private boolean postProcessBeanDefinitionRegistryCalled = false;
/** /**
* Set the {@link SourceExtractor} to use for generated bean definitions * Set the {@link SourceExtractor} to use for generated bean definitions
@@ -126,6 +128,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
* Derive further bean definitions from the configuration classes in the registry. * Derive further bean definitions from the configuration classes in the registry.
*/ */
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) {
this.postProcessBeanDefinitionRegistryCalled = true;
processConfigBeanDefinitions(registry); processConfigBeanDefinitions(registry);
} }
@@ -134,9 +137,15 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
* by replacing them with CGLIB-enhanced subclasses. * by replacing them with CGLIB-enhanced subclasses.
*/ */
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
if (!this.postProcessBeanDefinitionRegistryCalled) {
// BeanDefinitionRegistryPostProcessor hook apparently not supported...
// Simply call processConfigBeanDefinitions lazily at this point then.
processConfigBeanDefinitions((BeanDefinitionRegistry) beanFactory);
}
enhanceConfigurationClasses(beanFactory); enhanceConfigurationClasses(beanFactory);
} }
/** /**
* Build and validate a configuration model based on the registry of * Build and validate a configuration model based on the registry of
* {@link Configuration} classes. * {@link Configuration} classes.