Merge branch 'master' of github.com:hgschmie/jedis into hgschmie-master

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

@@ -948,6 +948,12 @@ public class BinaryClient extends Connection {
 	super.disconnect();
     }
 
+    @Override
+    public void close() {
+	db = 0;
+	super.close();
+    }
+
     public void resetState() {
 	if (isInMulti())
 	    discard();

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

@@ -2,6 +2,7 @@ package redis.clients.jedis;
 
 import static redis.clients.jedis.Protocol.toByteArray;
 
+import java.io.Closeable;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -19,7 +20,7 @@ import redis.clients.util.SafeEncoder;
 
 public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 	MultiKeyBinaryCommands, AdvancedBinaryJedisCommands,
-	BinaryScriptingCommands {
+	BinaryScriptingCommands, Closeable {
     protected Client client = null;
 
     public BinaryJedis(final String host) {
@@ -1742,6 +1743,11 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands,
 	return client.getStatusCodeReply();
     }
 
+    @Override
+	public void close() {
+	client.close();
+    }
+
     /**
      * Sort a Set or a List.
      * <p>

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

@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -15,7 +16,7 @@ import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
 import redis.clients.util.SafeEncoder;
 
-public class Connection {
+public class Connection implements Closeable {
     private String host;
     private int port = Protocol.DEFAULT_PORT;
     private Socket socket;
@@ -143,6 +144,11 @@ public class Connection {
 	}
     }
 
+    @Override
+    public void close() {
+	disconnect();
+   }
+
     public void disconnect() {
 	if (isConnected()) {
 	    try {