Fix Lettuce exec to return null when pipelining

DATAREDIS-139
This commit is contained in:
Jennifer Hickey
2013-04-01 10:09:02 -07:00
parent b3a0deebf8
commit a40555ed19
3 changed files with 3 additions and 7 deletions

View File

@@ -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) {

View File

@@ -267,8 +267,7 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends
assertNull(connection.get("key"));
assertNull(connection.exec());
List<Object> convertedResults = convertResults(connection.closePipeline());
assertEquals(Arrays.asList(new Object[] { Arrays.asList(new String[] { "OK", "value" }) }),
convertedResults);
assertEquals(Arrays.asList(new Object[] { "value" }), convertedResults);
}
@Test

View File

@@ -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() {
}