+ fixed NPE when closing up non-initialized contexts

ae8c0535 · Costin Leau · 773bdcde · ae8c0535
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

org.springframework.context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java ...ontext/support/AbstractRefreshableApplicationContext.java +2 -1

未找到文件。
--- 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);
 	}