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