AbstractBeanFactory.markBeanAsCreated() reliably clears merged bean definition first

Issue: SPR-14269
This commit is contained in:
Juergen Hoeller
2016-05-29 13:25:16 +02:00
parent f7f2327f60
commit 6efa058917

View File

@@ -1503,11 +1503,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
*/
protected void markBeanAsCreated(String beanName) {
if (!this.alreadyCreated.contains(beanName)) {
this.alreadyCreated.add(beanName);
// Let the bean definition get re-merged now that we're actually creating
// the bean... just in case some of its metadata changed in the meantime.
clearMergedBeanDefinition(beanName);
this.alreadyCreated.add(beanName);
}
}