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