Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turn off beanFactoryReference for Gemfire Caches

Browse Source 
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**
This commit is contained in:
Artem Bilan
2016-12-01 11:12:08 -05:00
parent 5a498e06bc
commit 90136d756c
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests-context.xml
View File

@@ -10,7 +10,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd"> 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"/> <gfe:local-region id="region1" cache-ref="gemfire-cache-2"/>

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests.java
View File

@@ -24,6 +24,7 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException; import org.springframework.messaging.MessagingException;
import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.ErrorMessage;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -36,6 +37,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
*/ */
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration @ContextConfiguration
@DirtiesContext
public class GemfireInboundChannelAdapterTests { public class GemfireInboundChannelAdapterTests {
@Autowired @Autowired
SubscribableChannel channel1; SubscribableChannel channel1;

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests-context.xml
View File

@@ -9,7 +9,7 @@
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd 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"> 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"/> <gfe:replicated-region id="region1"/>

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/util/AggregatorWithGemfireLocksTests-context.xml
View File

@@ -7,7 +7,7 @@
http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd 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"> 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"> <bean id="lockRegistry" class="org.springframework.integration.gemfire.util.GemfireLockRegistry">
<constructor-arg ref="gemfireCache"/> <constructor-arg ref="gemfireCache"/>