root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

DefaultSingletonBeanRegistry avoids singletonObjects lock wherever possible for non-singleton factory performance 

Issue: SPR-9819
This commit is contained in:
Juergen Hoeller 2012-11-08 23:15:38 +01:00
parent e1d11ec99d
commit c24825ca19
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
View File

@ -166,7 +166,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
} }
public Object getSingleton(String beanName) { public Object getSingleton(String beanName) {
return getSingleton(beanName, true); return getSingleton(beanName, isSingletonCurrentlyInCreation(beanName));
} }
/** /**
@ -179,10 +179,10 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
*/ */
protected Object getSingleton(String beanName, boolean allowEarlyReference) { protected Object getSingleton(String beanName, boolean allowEarlyReference) {
Object singletonObject = this.singletonObjects.get(beanName); Object singletonObject = this.singletonObjects.get(beanName);
if (singletonObject == null) { if (singletonObject == null && allowEarlyReference) {
synchronized (this.singletonObjects) { synchronized (this.singletonObjects) {
singletonObject = this.earlySingletonObjects.get(beanName); singletonObject = this.earlySingletonObjects.get(beanName);
if (singletonObject == null && allowEarlyReference) { if (singletonObject == null) {
ObjectFactory singletonFactory = this.singletonFactories.get(beanName); ObjectFactory singletonFactory = this.singletonFactories.get(beanName);
if (singletonFactory != null) { if (singletonFactory != null) {
singletonObject = singletonFactory.getObject(); singletonObject = singletonFactory.getObject();