From d4870d03168153ade6383c6fecab98699c88d275 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 12 Aug 2011 14:07:01 +0300
Subject: [PATCH] SGF-59 + handle NPE on client subscription

---
 .../data/gemfire/server/CacheServerFactoryBean.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
index 8c0db0f7..dea15af1 100644
--- a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
@@ -104,7 +104,8 @@ public class CacheServerFactoryBean implements FactoryBean<CacheServer>, Initial
 		ClientSubscriptionConfig config = cacheServer.getClientSubscriptionConfig();
 		config.setCapacity(subscriptionCapacity);
 		config.setEvictionPolicy(evictionPolicy.name().toLowerCase());
-		config.setDiskStoreName(subscriptionDiskStore.getFile().getCanonicalPath());
+		if (subscriptionDiskStore != null)
+			config.setDiskStoreName(subscriptionDiskStore.getFile().getCanonicalPath());
 
 		start();
 	}