Skip to content

Refactor concurrency within DefaultSingletonBeanRegistry #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Refactor concurrency within DefaultSingletonBeanRegistry #1745

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 49 additions & 41 deletions ...src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,14 @@ protected void addSingleton(String beanName, Object singletonObject) {
*/
protected void addSingletonFactory(String beanName, ObjectFactory<?> singletonFactory) {
Assert.notNull(singletonFactory, "Singleton factory must not be null");
synchronized (this.singletonObjects) {
if (!this.singletonObjects.containsKey(beanName)) {
this.singletonFactories.put(beanName, singletonFactory);
this.earlySingletonObjects.remove(beanName);
this.registeredSingletons.add(beanName);

if (!this.singletonObjects.containsKey(beanName)) {
synchronized (this.singletonObjects) {
if (!this.singletonObjects.containsKey(beanName)) {
this.singletonFactories.put(beanName, singletonFactory);
this.earlySingletonObjects.remove(beanName);
this.registeredSingletons.add(beanName);
}
}
}
}
Expand Down Expand Up @@ -390,15 +393,13 @@ public void registerContainedBean(String containedBeanName, String containingBea
return;
}

// No entry yet -> fully synchronized manipulation of the containedBeans Set
synchronized (this.containedBeanMap) {
containedBeans = this.containedBeanMap.get(containingBeanName);
if (containedBeans == null) {
containedBeans = new LinkedHashSet<>(8);
this.containedBeanMap.put(containingBeanName, containedBeans);
}
containedBeans.add(containedBeanName);
if(containedBeans == null) {
containedBeans = containedBeanMap.computeIfAbsent(
containingBeanName, (key) -> Collections.synchronizedSet(new LinkedHashSet<String>(8))
);
}

containedBeans.add(containedBeanName);
registerDependentBean(containedBeanName, containingBeanName);
}

Expand All @@ -416,23 +417,20 @@ public void registerDependentBean(String beanName, String dependentBeanName) {
return;
}

// No entry yet -> fully synchronized manipulation of the dependentBeans Set
synchronized (this.dependentBeanMap) {
dependentBeans = this.dependentBeanMap.get(canonicalName);
if (dependentBeans == null) {
dependentBeans = new LinkedHashSet<>(8);
this.dependentBeanMap.put(canonicalName, dependentBeans);
}
dependentBeans.add(dependentBeanName);
}
synchronized (this.dependenciesForBeanMap) {
Set<String> dependenciesForBean = this.dependenciesForBeanMap.get(dependentBeanName);
if (dependenciesForBean == null) {
dependenciesForBean = new LinkedHashSet<>(8);
this.dependenciesForBeanMap.put(dependentBeanName, dependenciesForBean);
if(dependentBeans == null) {
//need synchronization to get consistent view on entrySet
synchronized (this.dependentBeanMap) {
dependentBeans = this.dependentBeanMap.computeIfAbsent(canonicalName,
(key) -> Collections.synchronizedSet(new LinkedHashSet<>(8))
);
}
dependenciesForBean.add(canonicalName);
}
dependentBeans.add(dependentBeanName);

Set<String> dependenciesForBean = this.dependenciesForBeanMap.computeIfAbsent(dependentBeanName,
(key) -> Collections.synchronizedSet(new LinkedHashSet<>(8))
);
dependenciesForBean.add(canonicalName);
}

/**
Expand All @@ -458,13 +456,15 @@ private boolean isDependent(String beanName, String dependentBeanName, @Nullable
if (dependentBeans.contains(dependentBeanName)) {
return true;
}
for (String transitiveDependency : dependentBeans) {
if (alreadySeen == null) {
alreadySeen = new HashSet<>();
}
alreadySeen.add(beanName);
if (isDependent(transitiveDependency, dependentBeanName, alreadySeen)) {
return true;
synchronized (dependentBeans) {
for (String transitiveDependency : dependentBeans) {
if (alreadySeen == null) {
alreadySeen = new HashSet<>();
}
alreadySeen.add(beanName);
if (isDependent(transitiveDependency, dependentBeanName, alreadySeen)) {
return true;
}
}
}
return false;
Expand All @@ -488,7 +488,9 @@ public String[] getDependentBeans(String beanName) {
if (dependentBeans == null) {
return new String[0];
}
return StringUtils.toStringArray(dependentBeans);
synchronized (dependentBeans) {
return StringUtils.toStringArray(dependentBeans);
}
}

/**
Expand All @@ -502,7 +504,9 @@ public String[] getDependenciesForBean(String beanName) {
if (dependenciesForBean == null) {
return new String[0];
}
return StringUtils.toStringArray(dependenciesForBean);
synchronized (dependenciesForBean) {
return StringUtils.toStringArray(dependenciesForBean);
}
}

public void destroySingletons() {
Expand Down Expand Up @@ -565,8 +569,10 @@ protected void destroyBean(String beanName, @Nullable DisposableBean bean) {
if (logger.isDebugEnabled()) {
logger.debug("Retrieved dependent beans for bean '" + beanName + "': " + dependencies);
}
for (String dependentBeanName : dependencies) {
destroySingleton(dependentBeanName);
synchronized (dependencies) {
for (String dependentBeanName : dependencies) {
destroySingleton(dependentBeanName);
}
}
}

Expand All @@ -583,8 +589,10 @@ protected void destroyBean(String beanName, @Nullable DisposableBean bean) {
// Trigger destruction of contained beans...
Set<String> containedBeans = this.containedBeanMap.remove(beanName);
if (containedBeans != null) {
for (String containedBeanName : containedBeans) {
destroySingleton(containedBeanName);
synchronized (containedBeans) {
for (String containedBeanName : containedBeans) {
destroySingleton(containedBeanName);
}
}
}

Expand Down