Merge branch 'safe_disconnect' of https://github.com/grdmitro/jedis into grdmitro-safe_disconnect

2011-04-06 02:00:13 -03:00
parent 90e68fa482 620a5d699f
commit 1502990cea
1 changed files with 12 additions and 4 deletions
--- a/src/main/java/redis/clients/jedis/ShardedJedisPool.java
+++ b/src/main/java/redis/clients/jedis/ShardedJedisPool.java
@@ -67,11 +67,19 @@ public class ShardedJedisPool extends Pool<ShardedJedis> {
        }

        public void destroyObject(final Object obj) throws Exception {
-            if (obj != null) {
-                try {
-                    ((ShardedJedis) obj).disconnect();
-                } catch (Exception e) {
+            if ((obj != null) && (obj instanceof ShardedJedis)) {
+                ShardedJedis shardedJedis = (ShardedJedis) obj;
+                for (Jedis jedis : shardedJedis.getAllShards()) {
+                    try {
+                   		try {
+                   			jedis.quit();
+                        } catch (Exception e) {

+                        }
+                        jedis.disconnect();
+                    } catch (Exception e) {
+
+                    }
                }
            }
        }