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

AbstractAutowireCapableBeanFactory avoids early FactoryBean instantiation on currently created configuration bean

Browse Source 
Issue: SPR-12141
(cherry picked from commit 4432c41)
This commit is contained in:
Juergen Hoeller
2014-09-03 13:48:47 +02:00
parent 3b64db18f7
commit 5da8a16284
3 changed files with 89 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@@ -795,7 +795,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
if (bw != null) {
return (FactoryBean<?>) bw.getWrappedInstance();
}
if (isSingletonCurrentlyInCreation(beanName)) {
if (isSingletonCurrentlyInCreation(beanName) ||
(mbd.getFactoryBeanName() != null && isSingletonCurrentlyInCreation(mbd.getFactoryBeanName()))) {
return null;
}
Object instance = null;