From 4e13ac5b86ad01bf9d2e668745a9dc3912f8352f Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 1 Apr 2013 16:44:51 -0700 Subject: [PATCH] Fix Jedis persist does not execute as part of a transaction DATAREDIS-160 --- .../data/redis/connection/jedis/JedisConnection.java | 2 +- .../jedis/JedisConnectionTransactionIntegrationTests.java | 8 -------- 2 files changed, 1 insertion(+), 9 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 339b70543..f56cf69ea 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 @@ -699,7 +699,7 @@ public class JedisConnection implements RedisConnection { public Boolean persist(byte[] key) { try { if (isQueueing()) { - client.persist(key); + transaction.persist(key); return null; } if (isPipelined()) { 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 06a715997..aaee81976 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 @@ -1,8 +1,5 @@ package org.springframework.data.redis.connection.jedis; -import static org.junit.Assert.fail; - -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -10,7 +7,6 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.redis.RedisSystemException; -import org.springframework.data.redis.connection.RedisPipelineException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -19,10 +15,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class JedisConnectionTransactionIntegrationTests extends JedisConnectionPipelineIntegrationTests { - @Ignore("DATAREDIS-160 Jedis persist does not execute as part of a transaction") - public void testPersist() throws Exception { - } - @Ignore("DATAREDIS-159 brPop executes twice in a transaction") public void testBRPop() { }