Merge branch 'pipeline-and-transaction-can-handle-responses-on-their-own-status' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-pipeline-and-transaction-can-handle-responses-on-their-own-status

2014-08-13 07:18:48 +09:00
parent 68a56938c1 514144d472
commit c42965dcd5
9 changed files with 83 additions and 54 deletions
--- a/src/main/java/redis/clients/jedis/BinaryClient.java
+++ b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -963,9 +963,6 @@ public class BinaryClient extends Connection {
    }

    public void resetState() {
-	if (isInMulti())
-	    discard();
-
 	if (isInWatch())
 	    unwatch();
    }