Skip to content

Commit 24aae2e

Browse files
committed
Defensive containsSingleton cache guard within getObjectFromFactoryBean
Issue: SPR-16625
1 parent f59ea61 commit 24aae2e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ protected Object getObjectFromFactoryBean(FactoryBean<?> factory, String beanNam
115115
"Post-processing of FactoryBean's singleton object failed", ex);
116116
}
117117
}
118-
this.factoryBeanObjectCache.put(beanName, object);
118+
if (containsSingleton(beanName)) {
119+
this.factoryBeanObjectCache.put(beanName, object);
120+
}
119121
}
120122
}
121123
return object;

0 commit comments

Comments
 (0)