Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defensively acquire singleton lock for FactoryBean type check

Browse Source 
Closes gh-34247
This commit is contained in:
Juergen Hoeller
2025-01-13 13:04:42 +01:00
parent ff72652890
commit 8771b9ea21
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -991,7 +991,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
*/
@Nullable
private FactoryBean<?> getSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) {
this.singletonLock.lock();
boolean locked = this.singletonLock.tryLock();
if (!locked) {
return null;
}
try {
BeanWrapper bw = this.factoryBeanInstanceCache.get(beanName);
if (bw != null) {