Merge branch 'reset-state-of-jedis-client' of github.com:HeartSaVioR/jedis into HeartSaVioR-reset-state-of-jedis-client

src/main/java/redis/clients/jedis/BinaryClient.java

@@ -29,15 +29,21 @@ public class BinaryClient extends Connection {
     }
 
     private boolean isInMulti;
-
+    
     private String password;
 
     private long db;
 
+	private boolean isInWatch;
+
     public boolean isInMulti() {
 	return isInMulti;
     }
 
+    public boolean isInWatch() {
+    return isInWatch;
+    }
+
     public BinaryClient(final String host) {
 	super(host);
     }
@@ -446,19 +452,23 @@ public class BinaryClient extends Connection {
     public void discard() {
 	sendCommand(DISCARD);
 	isInMulti = false;
+	isInWatch = false;
     }
 
     public void exec() {
 	sendCommand(EXEC);
 	isInMulti = false;
+	isInWatch = false;
     }
 
     public void watch(final byte[]... keys) {
 	sendCommand(WATCH, keys);
+	isInWatch = true;
     }
 
     public void unwatch() {
 	sendCommand(UNWATCH);
+	isInWatch = false;
     }
 
     public void sort(final byte[] key) {
@@ -911,6 +921,14 @@ public class BinaryClient extends Connection {
 	db = 0;
 	super.disconnect();
     }
+    
+    public void resetState() {
+    	if (isInMulti())
+    		discard();
+    	
+    	if (isInWatch())
+    		unwatch();
+    }
 
     private void sendEvalCommand(Command command, byte[] script,
 	    byte[] keyCount, byte[][] params) {

src/main/java/redis/clients/jedis/BinaryJedis.java

@@ -1709,6 +1709,11 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKey
     public void disconnect() {
 	client.disconnect();
     }
+    
+    public void resetState() {
+	client.resetState();
+	client.getAll();
+    }
 
     public String watch(final byte[]... keys) {
 	client.watch(keys);

src/main/java/redis/clients/jedis/JedisPool.java

@@ -84,6 +84,7 @@ public class JedisPool extends Pool<Jedis> {
     }
 
     public void returnResource(final Jedis resource) {
+    resource.resetState();
 	returnResourceObject(resource);
     }
 }

src/main/java/redis/clients/jedis/JedisSentinelPool.java

@@ -79,6 +79,7 @@ public class JedisSentinelPool extends Pool<Jedis> {
     }
 
     public void returnResource(final Jedis resource) {
+    resource.resetState();
 	returnResourceObject(resource);
     }