admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fall back to local synchronization in getObjectFromFactoryBean

Browse Source 
Closes gh-35545
This commit is contained in:
Juergen Hoeller
2025-10-02 13:01:03 +02:00
parent 717358b56b
commit 74dc61b8c4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
+11 -1
View File
@@ -130,7 +130,17 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
try {
Object object = this.factoryBeanObjectCache.get(beanName);
if (object == null) {
object = doGetObjectFromFactoryBean(factory, beanName);
if (locked) {
// The common case: within general singleton lock.
object = doGetObjectFromFactoryBean(factory, beanName);
}
else {
// Fall back to local synchronization on the given FactoryBean instance,
// as a defensive measure for non-thread-safe FactoryBean implementations.
synchronized (factory) {
object = doGetObjectFromFactoryBean(factory, beanName);
}
}
// Only post-process and store if not put there already during getObject() call above
// (for example, because of circular reference processing triggered by custom getBean calls)
Object alreadyThere = this.factoryBeanObjectCache.get(beanName);