From fa0ba9b84e3789d762afffd4461b59c9a634c453 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 1 Dec 2016 11:12:08 -0500
Subject: [PATCH] Turn off beanFactoryReference for Gemfire Caches

Looks like there is some race condition around static fields in the `GemfireBeanFactoryLocator`

Also add `@DirtiesContext` to the `GemfireInboundChannelAdapterTests`

**Cherry-pick to 4.3.x and master**

(cherry picked from commit 90136d7)
---
 .../inbound/GemfireInboundChannelAdapterTests-context.xml       | 2 +-
 .../outbound/GemfireOutboundChannelAdapterTests-context.xml     | 2 +-
 .../gemfire/util/AggregatorWithGemfireLocksTests-context.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml
index c1385cead9..78018b11ef 100644
--- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml
+++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml
@@ -10,7 +10,7 @@
 		http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<gfe:cache id="gemfire-cache-2"/>
+	<gfe:cache id="gemfire-cache-2" use-bean-factory-locator="false"/>
 
 	<gfe:local-region id="region1" cache-ref="gemfire-cache-2"/>
 
diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml
index 7c7b634932..fa3deacc8a 100644
--- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml
+++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml
@@ -9,7 +9,7 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<gfe:cache />
+	<gfe:cache use-bean-factory-locator="false"/>
 
 	<gfe:replicated-region id="region1"/>
 
diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/util/AggregatorWithGemfireLocksTests-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/util/AggregatorWithGemfireLocksTests-context.xml
index 516f307764..a3ab4038fa 100644
--- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/util/AggregatorWithGemfireLocksTests-context.xml
+++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/util/AggregatorWithGemfireLocksTests-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
-	<gfe:cache />
+	<gfe:cache use-bean-factory-locator="false"/>
 
 	<bean id="lockRegistry" class="org.springframework.integration.gemfire.util.GemfireLockRegistry">
 		<constructor-arg ref="gemfireCache"/>