From a40555ed19a5e5b4502cf6d0718026b8d032015f Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Mon, 1 Apr 2013 10:09:02 -0700 Subject: [PATCH] Fix Lettuce exec to return null when pipelining DATAREDIS-139 --- .../data/redis/connection/lettuce/LettuceConnection.java | 3 ++- .../AbstractConnectionPipelineIntegrationTests.java | 3 +-- .../lettuce/LettuceConnectionPipelineIntegrationTests.java | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java index 163ec7e56..e39c628bb 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java @@ -460,7 +460,8 @@ public class LettuceConnection implements RedisConnection { isMulti = false; try { if (isPipelined()) { - return Collections.singletonList((Object) asyncConn.exec()); + asyncConn.exec(); + return null; } return con.exec(); } catch (Exception ex) { diff --git a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java index e591ae838..3c153ff84 100644 --- a/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java @@ -267,8 +267,7 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends assertNull(connection.get("key")); assertNull(connection.exec()); List convertedResults = convertResults(connection.closePipeline()); - assertEquals(Arrays.asList(new Object[] { Arrays.asList(new String[] { "OK", "value" }) }), - convertedResults); + assertEquals(Arrays.asList(new Object[] { "value" }), convertedResults); } @Test diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java index 788f302f6..4369646cf 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionPipelineIntegrationTests.java @@ -65,10 +65,6 @@ public class LettuceConnectionPipelineIntegrationTests extends public void testUnwatch() throws Exception { } - @Ignore("DATAREDIS-139 Lettuce exec while pipelining returns a non-null value") - public void testMultiExec() throws Exception { - } - @Ignore("DATAREDIS-140 Lettuce zCount/zInterStore methods execute synchronously when pipelining") public void testZInterStoreAggWeights() { }