+ fixed NPE when closing up non-initialized contexts

2009-08-28 05:43:12 +00:00
parent 773bdcded5
commit ae8c053568
1 changed files with 2 additions and 1 deletions
--- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
@@ -137,7 +137,8 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
 	@Override
 	protected void cancelRefresh(BeansException ex) {
 		synchronized (this.beanFactoryMonitor) {
-			this.beanFactory.setSerializationId(null);
+			if (this.beanFactory != null)
+				this.beanFactory.setSerializationId(null);
 		}
 		super.cancelRefresh(ex);
 	}