From ae8c0535685208757bb452eb550483c73f0aebf2 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 28 Aug 2009 05:43:12 +0000
Subject: [PATCH] + fixed NPE when closing up non-initialized contexts

---
 .../context/support/AbstractRefreshableApplicationContext.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 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
index 839fd59b7ef..a49812b1dbe 100644
--- 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);
 	}