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

Avoid wide locks in order to remove deadlock potential in case of multi-threaded singleton creation/destruction 

Issue: SPR-10020
Issue: SPR-8471
This commit is contained in:
Juergen Hoeller 2012-11-25 23:32:52 +01:00
parent 87b7e3d8cf
commit 52124fa31b
3 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -576,35 +576,36 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
if (this.logger.isInfoEnabled()) { if (this.logger.isInfoEnabled()) {
this.logger.info("Pre-instantiating singletons in " + this); this.logger.info("Pre-instantiating singletons in " + this);
} }
List<String> beanNames;
synchronized (this.beanDefinitionMap) { synchronized (this.beanDefinitionMap) {
// Iterate over a copy to allow for init methods which in turn register new bean definitions. // Iterate over a copy to allow for init methods which in turn register new bean definitions.
// While this may not be part of the regular factory bootstrap, it does otherwise work fine. // While this may not be part of the regular factory bootstrap, it does otherwise work fine.
List<String> beanNames = new ArrayList<String>(this.beanDefinitionNames); beanNames = new ArrayList<String>(this.beanDefinitionNames);
for (String beanName : beanNames) { }
RootBeanDefinition bd = getMergedLocalBeanDefinition(beanName); for (String beanName : beanNames) {
if (!bd.isAbstract() && bd.isSingleton() && !bd.isLazyInit()) { RootBeanDefinition bd = getMergedLocalBeanDefinition(beanName);
if (isFactoryBean(beanName)) { if (!bd.isAbstract() && bd.isSingleton() && !bd.isLazyInit()) {
final FactoryBean<?> factory = (FactoryBean<?>) getBean(FACTORY_BEAN_PREFIX + beanName); if (isFactoryBean(beanName)) {
boolean isEagerInit; final FactoryBean<?> factory = (FactoryBean<?>) getBean(FACTORY_BEAN_PREFIX + beanName);
if (System.getSecurityManager() != null && factory instanceof SmartFactoryBean) { boolean isEagerInit;
isEagerInit = AccessController.doPrivileged(new PrivilegedAction<Boolean>() { if (System.getSecurityManager() != null && factory instanceof SmartFactoryBean) {
public Boolean run() { isEagerInit = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
return ((SmartFactoryBean<?>) factory).isEagerInit(); public Boolean run() {
} return ((SmartFactoryBean<?>) factory).isEagerInit();
}, getAccessControlContext()); }
} }, getAccessControlContext());
else {
isEagerInit = (factory instanceof SmartFactoryBean &&
((SmartFactoryBean<?>) factory).isEagerInit());
}
if (isEagerInit) {
getBean(beanName);
}
} }
else { else {
isEagerInit = (factory instanceof SmartFactoryBean &&
((SmartFactoryBean<?>) factory).isEagerInit());
}
if (isEagerInit) {
getBean(beanName); getBean(beanName);
} }
} }
else {
getBean(beanName);
}
} }
} }
} }
@ -650,9 +651,9 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
this.frozenBeanDefinitionNames = null; this.frozenBeanDefinitionNames = null;
} }
this.beanDefinitionMap.put(beanName, beanDefinition); this.beanDefinitionMap.put(beanName, beanDefinition);
resetBeanDefinition(beanName);
} }
resetBeanDefinition(beanName);
} }
public void removeBeanDefinition(String beanName) throws NoSuchBeanDefinitionException { public void removeBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
@ -668,9 +669,9 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
} }
this.beanDefinitionNames.remove(beanName); this.beanDefinitionNames.remove(beanName);
this.frozenBeanDefinitionNames = null; this.frozenBeanDefinitionNames = null;
resetBeanDefinition(beanName);
} }
resetBeanDefinition(beanName);
} }
/** /**
@ -685,9 +686,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
// Remove corresponding bean from singleton cache, if any. Shouldn't usually // Remove corresponding bean from singleton cache, if any. Shouldn't usually
// be necessary, rather just meant for overriding a context's default beans // be necessary, rather just meant for overriding a context's default beans
// (e.g. the default StaticMessageSource in a StaticApplicationContext). // (e.g. the default StaticMessageSource in a StaticApplicationContext).
synchronized (getSingletonMutex()) { destroySingleton(beanName);
destroySingleton(beanName);
}
// Remove any assumptions about by-type mappings // Remove any assumptions about by-type mappings
this.singletonBeanNamesByType.clear(); this.singletonBeanNamesByType.clear();

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

@ -447,11 +447,12 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
this.singletonsCurrentlyInDestruction = true; this.singletonsCurrentlyInDestruction = true;
} }
String[] disposableBeanNames;
synchronized (this.disposableBeans) { synchronized (this.disposableBeans) {
String[] disposableBeanNames = StringUtils.toStringArray(this.disposableBeans.keySet()); disposableBeanNames = StringUtils.toStringArray(this.disposableBeans.keySet());
for (int i = disposableBeanNames.length - 1; i >= 0; i--) { }
destroySingleton(disposableBeanNames[i]); for (int i = disposableBeanNames.length - 1; i >= 0; i--) {
} destroySingleton(disposableBeanNames[i]);
} }
this.containedBeanMap.clear(); this.containedBeanMap.clear();

40
spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -113,7 +113,9 @@ public abstract class AbstractApplicationEventMulticaster implements Application
* @see org.springframework.context.ApplicationListener * @see org.springframework.context.ApplicationListener
*/ */
protected Collection<ApplicationListener> getApplicationListeners() { protected Collection<ApplicationListener> getApplicationListeners() {
return this.defaultRetriever.getApplicationListeners(); synchronized (this.defaultRetriever) {
return this.defaultRetriever.getApplicationListeners();
}
} }
/** /**
@ -135,26 +137,30 @@ public abstract class AbstractApplicationEventMulticaster implements Application
else { else {
retriever = new ListenerRetriever(true); retriever = new ListenerRetriever(true);
LinkedList<ApplicationListener> allListeners = new LinkedList<ApplicationListener>(); LinkedList<ApplicationListener> allListeners = new LinkedList<ApplicationListener>();
Set<ApplicationListener> listeners;
Set<String> listenerBeans;
synchronized (this.defaultRetriever) { synchronized (this.defaultRetriever) {
for (ApplicationListener listener : this.defaultRetriever.applicationListeners) { listeners = new LinkedHashSet<ApplicationListener>(this.defaultRetriever.applicationListeners);
if (supportsEvent(listener, eventType, sourceType)) { listenerBeans = new LinkedHashSet<String>(this.defaultRetriever.applicationListenerBeans);
retriever.applicationListeners.add(listener); }
for (ApplicationListener listener : listeners) {
if (supportsEvent(listener, eventType, sourceType)) {
retriever.applicationListeners.add(listener);
allListeners.add(listener);
}
}
if (!listenerBeans.isEmpty()) {
BeanFactory beanFactory = getBeanFactory();
for (String listenerBeanName : listenerBeans) {
ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class);
if (!allListeners.contains(listener) && supportsEvent(listener, eventType, sourceType)) {
retriever.applicationListenerBeans.add(listenerBeanName);
allListeners.add(listener); allListeners.add(listener);
} }
} }
if (!this.defaultRetriever.applicationListenerBeans.isEmpty()) {
BeanFactory beanFactory = getBeanFactory();
for (String listenerBeanName : this.defaultRetriever.applicationListenerBeans) {
ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class);
if (!allListeners.contains(listener) && supportsEvent(listener, eventType, sourceType)) {
retriever.applicationListenerBeans.add(listenerBeanName);
allListeners.add(listener);
}
}
}
OrderComparator.sort(allListeners);
this.retrieverCache.put(cacheKey, retriever);
} }
OrderComparator.sort(allListeners);
this.retrieverCache.put(cacheKey, retriever);
return allListeners; return allListeners;
} }
} }