File tree 1 file changed +5
-2
lines changed
spring-beans/src/main/java/org/springframework/beans/factory/support 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -1504,10 +1504,11 @@ else if (mbd.isLazyInit()) {
1504
1504
protected void markBeanAsCreated (String beanName ) {
1505
1505
if (!this .alreadyCreated .contains (beanName )) {
1506
1506
synchronized (this .mergedBeanDefinitions ) {
1507
- if (this .alreadyCreated .add (beanName )) {
1507
+ if (! this .alreadyCreated .contains (beanName )) {
1508
1508
// Let the bean definition get re-merged now that we're actually creating
1509
1509
// the bean... just in case some of its metadata changed in the meantime.
1510
1510
clearMergedBeanDefinition (beanName );
1511
+ this .alreadyCreated .add (beanName );
1511
1512
}
1512
1513
}
1513
1514
}
@@ -1518,7 +1519,9 @@ protected void markBeanAsCreated(String beanName) {
1518
1519
* @param beanName the name of the bean
1519
1520
*/
1520
1521
protected void cleanupAfterBeanCreationFailure (String beanName ) {
1521
- this .alreadyCreated .remove (beanName );
1522
+ synchronized (this .mergedBeanDefinitions ) {
1523
+ this .alreadyCreated .remove (beanName );
1524
+ }
1522
1525
}
1523
1526
1524
1527
/**
You can’t perform that action at this time.
0 commit comments