From 8b625304c5e701c0c923fc492467cf4bd3290732 Mon Sep 17 00:00:00 2001 From: Thomas Darimont Date: Mon, 3 Mar 2014 14:27:18 +0100 Subject: [PATCH 1/2] DATAREDIS-282 - PubSubResubscribeTests fails randomly when using pooled jedis. Prepare issue branch. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 79b9f667dc..a66080120d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ jredisVersion=06052013 jedisVersion=2.4.1 springVersion=3.2.8.RELEASE log4jVersion=1.2.17 -version=1.2.0.BUILD-SNAPSHOT +version=1.2.0.DATAREDIS-282-SNAPSHOT srpVersion=0.7 jacksonVersion=1.8.8 fasterXmlJacksonVersion=2.2.0 From edf2c1d93bdaf76bb9f6c29d1ee499b22791490f Mon Sep 17 00:00:00 2001 From: Thomas Darimont Date: Mon, 3 Mar 2014 14:27:54 +0100 Subject: [PATCH 2/2] DATAREDIS-282 - PubSubResubscribeTests fails randomly when using pooled jedis. Disabled jedis pooling in PubSubResubscribeTests since all the other tests also don't use a pool. --- .../data/redis/listener/PubSubResubscribeTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java b/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java index c0e8895d6c..077b2398f4 100644 --- a/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java +++ b/src/test/java/org/springframework/data/redis/listener/PubSubResubscribeTests.java @@ -98,7 +98,7 @@ public static Collection testParams() { // Jedis JedisConnectionFactory jedisConnFactory = new JedisConnectionFactory(); - jedisConnFactory.setUsePool(true); + jedisConnFactory.setUsePool(false); jedisConnFactory.setPort(port); jedisConnFactory.setHostName(host); jedisConnFactory.setDatabase(2);