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

Author: jhoeller

org.springframework.context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java

@@ -152,7 +152,7 @@ private void startBeans(boolean autoStartupOnly) {
 	 * @param beanName the name of the bean to start
 	 */
 	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)) {
 			String[] dependenciesForBean = this.beanFactory.getDependenciesForBean(beanName);
 			for (String dependency : dependenciesForBean) {
@@ -172,7 +172,6 @@ private void doStart(Map<String, ? extends Lifecycle> lifecycleBeans, String bea
 					logger.debug("Successfully started bean '" + beanName + "'");
 				}
 			}
-			lifecycleBeans.remove(beanName);
 		}
 	}
 
@@ -207,7 +206,7 @@ private void stopBeans() {
 	private void doStop(Map<String, ? extends Lifecycle> lifecycleBeans, final String beanName,
 			final CountDownLatch latch, final Set<String> countDownBeanNames) {
 
-		Lifecycle bean = lifecycleBeans.get(beanName);
+		Lifecycle bean = lifecycleBeans.remove(beanName);
 		if (bean != null) {
 			String[] dependentBeans = this.beanFactory.getDependentBeans(beanName);
 			for (String dependentBean : dependentBeans) {
@@ -250,7 +249,6 @@ else if (bean instanceof SmartLifecycle) {
 					logger.warn("Failed to stop bean '" + beanName + "'", ex);
 				}
 			}
-			lifecycleBeans.remove(beanName);
 		}
 	}