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

Polish whitespace in ConfigurationClassEnhancer

This commit is contained in:
Chris Beams 2011-12-10 19:31:18 +00:00
parent 06d06d4aa9
commit 866999764d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
View File

@ -252,13 +252,14 @@ class ConfigurationClassEnhancer {
// is the same as that of referring to a FactoryBean within XML. See SPR-6602. // is the same as that of referring to a FactoryBean within XML. See SPR-6602.
if (factoryContainsBean('&'+beanName) && factoryContainsBean(beanName)) { if (factoryContainsBean('&'+beanName) && factoryContainsBean(beanName)) {
Object factoryBean = this.beanFactory.getBean('&'+beanName); Object factoryBean = this.beanFactory.getBean('&'+beanName);
if (factoryBean instanceof ScopedProxyFactoryBean) { if (factoryBean instanceof ScopedProxyFactoryBean) {
// pass through - scoped proxy factory beans are a special case and should not // pass through - scoped proxy factory beans are a special case and should not
// be further proxied // be further proxied
} else { }
// it is a candidate FactoryBean - go ahead with enhancement else {
return enhanceFactoryBean(factoryBean.getClass(), beanName); // it is a candidate FactoryBean - go ahead with enhancement
} return enhanceFactoryBean(factoryBean.getClass(), beanName);
}
} }
boolean factoryIsCaller = beanMethod.equals(SimpleInstantiationStrategy.getCurrentlyInvokedFactoryMethod()); boolean factoryIsCaller = beanMethod.equals(SimpleInstantiationStrategy.getCurrentlyInvokedFactoryMethod());