From 408813b2c15de6d467f043c1145a0fb394b7fe1e Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski_at_vmware_dot_com>
Date: Fri, 4 Jan 2013 08:11:01 -0500
Subject: [PATCH] SGF-145 - allow disk overflow with non persistent regions

---
 .../org/springframework/data/gemfire/RegionFactoryBean.java     | 2 --
 .../org/springframework/data/gemfire/config/diskstore-ns.xml    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
index 878f2bc8..4cb97bd8 100644
--- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java
@@ -159,8 +159,6 @@ public class RegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V> imple
 
 		if (diskStoreName != null) {
 			regionFactory.setDiskStoreName(diskStoreName);
-			Assert.isTrue(!isNotPersistent(), "it is invalid to specify a disk store if 'persistent' is set to false.");
-			persistent = true;
 		}
 
 		resolveDataPolicy(regionFactory, persistent, dataPolicy);
diff --git a/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
index 08b17139..5e7d5863 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/diskstore-ns.xml
@@ -32,7 +32,7 @@
         <gfe:entry-ttl timeout="${ttl}" action="DESTROY"/>
     </gfe:partitioned-region>
 	
-	<gfe:replicated-region id="replicated-data" close="true" destroy="false" disk-store-ref="diskStore1">
+	<gfe:replicated-region id="replicated-data" close="true" destroy="false" disk-store-ref="diskStore1" persistent="false">
 		<gfe:region-ttl timeout="${ttl}" action="DESTROY"/>
 		<gfe:region-tti timeout="400" action="INVALIDATE"/>