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

revised DefaultLifecycleProcessor's handling of circular dependencies to avoid stack overflow (SPR-7266) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3400 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-06-08 10:08:33 +00:00
parent be6385ea20
commit 52c6a7a6a4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
View File

@ -152,7 +152,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
* @param beanName the name of the bean to start * @param beanName the name of the bean to start
*/ */
private void doStart(Map<String, ? extends Lifecycle> lifecycleBeans, String beanName) { private void doStart(Map<String, ? extends Lifecycle> lifecycleBeans, String beanName) {
Lifecycle bean = lifecycleBeans.get(beanName); Lifecycle bean = lifecycleBeans.remove(beanName);
if (bean != null && !this.equals(bean)) { if (bean != null && !this.equals(bean)) {
String[] dependenciesForBean = this.beanFactory.getDependenciesForBean(beanName); String[] dependenciesForBean = this.beanFactory.getDependenciesForBean(beanName);
for (String dependency : dependenciesForBean) { for (String dependency : dependenciesForBean) {
@ -172,7 +172,6 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
logger.debug("Successfully started bean '" + beanName + "'"); logger.debug("Successfully started bean '" + beanName + "'");
} }
} }
lifecycleBeans.remove(beanName);
} }
} }
@ -207,7 +206,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
private void doStop(Map<String, ? extends Lifecycle> lifecycleBeans, final String beanName, private void doStop(Map<String, ? extends Lifecycle> lifecycleBeans, final String beanName,
final CountDownLatch latch, final Set<String> countDownBeanNames) { final CountDownLatch latch, final Set<String> countDownBeanNames) {
Lifecycle bean = lifecycleBeans.get(beanName); Lifecycle bean = lifecycleBeans.remove(beanName);
if (bean != null) { if (bean != null) {
String[] dependentBeans = this.beanFactory.getDependentBeans(beanName); String[] dependentBeans = this.beanFactory.getDependentBeans(beanName);
for (String dependentBean : dependentBeans) { for (String dependentBean : dependentBeans) {
@ -250,7 +249,6 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
logger.warn("Failed to stop bean '" + beanName + "'", ex); logger.warn("Failed to stop bean '" + beanName + "'", ex);
} }
} }
lifecycleBeans.remove(beanName);
} }
} }