From c5c3a81f425052859585f3f429848044c5b1cd7d Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 1 Apr 2013 16:45:40 -0700 Subject: [PATCH] Fix Jedis brPop executes twice in a transaction DATAREDIS-159 --- .../data/redis/connection/jedis/JedisConnection.java | 1 + .../jedis/JedisConnectionTransactionIntegrationTests.java | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java index f56cf69ea..2a5df1150 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java @@ -1228,6 +1228,7 @@ public class JedisConnection implements RedisConnection { try { if (isQueueing()) { transaction.brpop(JedisUtils.bXPopArgs(timeout, keys)); + return null; } if (isPipelined()) { pipeline.brpop(JedisUtils.bXPopArgs(timeout, keys)); diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java index aaee81976..70e75235d 100644 --- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionTransactionIntegrationTests.java @@ -15,14 +15,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class JedisConnectionTransactionIntegrationTests extends JedisConnectionPipelineIntegrationTests { - @Ignore("DATAREDIS-159 brPop executes twice in a transaction") - public void testBRPop() { - } - - @Ignore("DATAREDIS-159 brPop executes twice in a transaction") - public void testBRPopTimeout() { - } - @Ignore public void testMultiDiscard() { }