From 6efa0589170fbcdd7fc0fe850d5b55b75918fdb2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 29 May 2016 13:25:16 +0200 Subject: [PATCH] AbstractBeanFactory.markBeanAsCreated() reliably clears merged bean definition first Issue: SPR-14269 --- .../beans/factory/support/AbstractBeanFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index 638d06ceb1..fb6e370135 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -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); } }