Defensive containsSingleton cache guard within getObjectFromFactoryBean

Issue: SPR-16625
2018-03-27 00:24:03 +02:00
parent f59ea610df
commit 24aae2e104
1 changed files with 3 additions and 1 deletions
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
@@ -115,7 +115,9 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 										"Post-processing of FactoryBean's singleton object failed", ex);
 							}
 						}
-						this.factoryBeanObjectCache.put(beanName, object);
+						if (containsSingleton(beanName)) {
+							this.factoryBeanObjectCache.put(beanName, object);
+						}
 					}
 				}
 				return object;