From c6a3accfd736cfaf406af0b426581f23bdb7ac79 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Thu, 19 Jan 2012 10:01:27 +0000
Subject: [PATCH 1/2] Prepare 1.1.x development branch.

---
 .gitignore                            | 7 ++++++-
 gradle.properties                     | 2 +-
 samples/hello-world/gradle.properties | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index effab4c9..fa419f58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,13 @@ pom.xml
 *.iws
 *.log
 .classpath
+.project
+.settings/
 
 /samples/hello-world/vf.gf.dmn-events.cfg
 /samples/hello-world/vf.gf.dmn-license.cfg
 /vf.gf.dmn-events.cfg
-/vf.gf.dmn-license.cfg
\ No newline at end of file
+/vf.gf.dmn-events.txt
+/vf.gf.dmn-license.cfg
+
+/BACKUP*
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index cc97c3f2..37f8f14b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,4 +21,4 @@ gemfire.range = "[6.5, 7.0)"
 # --------------------
 # Project wide version
 # --------------------
-springGemfireVersion=1.2.0.BUILD-SNAPSHOT
\ No newline at end of file
+springGemfireVersion=1.1.1.BUILD-SNAPSHOT
\ No newline at end of file
diff --git a/samples/hello-world/gradle.properties b/samples/hello-world/gradle.properties
index 048ae069..65b5d457 100644
--- a/samples/hello-world/gradle.properties
+++ b/samples/hello-world/gradle.properties
@@ -1,3 +1,3 @@
 junitVersion = 4.8.1
 springVersion = 3.1.0.RELEASE
-version = 1.2.0.BUILD-SNAPSHOT
+version = 1.1.1.BUILD-SNAPSHOT

From 5ee0e7c647f2c938746027aedb7d2afc30e8462d Mon Sep 17 00:00:00 2001
From: amaximov <amaximov@mbp13.local>
Date: Thu, 26 Jan 2012 10:47:03 -0500
Subject: [PATCH 2/2] SGF-80 ClientRegionFactoryBean ignoring
 ClientRegionShortcut

---
 .../client/ClientRegionFactoryBean.java       |  2 +
 .../client/ClientRegionFactoryBeanTest.java   | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java

diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
index c1a0a2c9..362add1b 100644
--- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java
@@ -90,6 +90,8 @@ public class ClientRegionFactoryBean<K, V> extends RegionLookupFactoryBean<K, V>
 				}
 			}
 			s = ClientRegionShortcut.LOCAL;
+		} else {
+			s = shortcut;
 		}
 
 		ClientRegionFactory<K, V> factory = c.createClientRegionFactory(s);
diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java
new file mode 100644
index 00000000..5c69a6b6
--- /dev/null
+++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java
@@ -0,0 +1,40 @@
+package org.springframework.data.gemfire.client;
+
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientRegionFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+
+public class ClientRegionFactoryBeanTest {
+
+	@Test
+	public void testLookupFallbackFailingToUseProvidedShortcut()
+			throws Exception {
+		ClientRegionFactoryBean<Object, Object> fb = new ClientRegionFactoryBean<Object, Object>();
+		fb.setShortcut(ClientRegionShortcut.CACHING_PROXY);
+
+		String regionName = "regionName";
+		ClientCache cache = Mockito.mock(ClientCache.class);
+
+		@SuppressWarnings("unchecked")
+		ClientRegionFactory<Object, Object> factory = Mockito
+				.mock(ClientRegionFactory.class);
+		Mockito.when(
+				cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY))
+				.thenReturn(factory);
+
+		@SuppressWarnings("unchecked")
+		Region<Object, Object> region = Mockito.mock(Region.class);
+		Mockito.when(factory.create(regionName)).thenReturn(region);
+
+		Region<Object, Object> result = fb.lookupFallback(cache, regionName);
+
+		assertSame(region, result);
+	}
+
+}