From 5bf29b43ee520309faf8bc4695f03337e4b88799 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Mon, 20 Jan 2014 07:31:13 +0900 Subject: [PATCH] Let BinaryJedis.multi() consumes "OK" message * Transaction doesn't have to consume "multi"'s response --- src/main/java/redis/clients/jedis/BinaryJedis.java | 2 ++ src/main/java/redis/clients/jedis/Transaction.java | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index f08633f..af5a395 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -1679,6 +1679,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey public Transaction multi() { client.multi(); + client.getOne(); // expected OK return new Transaction(client); } @@ -1687,6 +1688,7 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey jedisTransaction.setClient(client); try { client.multi(); + client.getOne(); // expected OK jedisTransaction.execute(); results = jedisTransaction.exec(); } catch (Exception ex) { diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java index 4d88932..11bb14a 100644 --- a/src/main/java/redis/clients/jedis/Transaction.java +++ b/src/main/java/redis/clients/jedis/Transaction.java @@ -44,8 +44,6 @@ public class Transaction extends MultiKeyPipelineBase { } public List exec() { - // Discard multi - consumeResponse(1); // Discard QUEUED or ERROR consumeResponse(getPipelinedResponseLength()); @@ -67,8 +65,6 @@ public class Transaction extends MultiKeyPipelineBase { } public List> execGetResponse() { - // Discard multi - consumeResponse(1); // Discard QUEUED or ERROR consumeResponse(getPipelinedResponseLength());