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

This commit is contained in:
Jonathan Leibiusky
2011-04-06 02:00:13 -03:00

View File

@@ -67,11 +67,19 @@ public class ShardedJedisPool extends Pool<ShardedJedis> {
} }
public void destroyObject(final Object obj) throws Exception { public void destroyObject(final Object obj) throws Exception {
if (obj != null) { if ((obj != null) && (obj instanceof ShardedJedis)) {
try { ShardedJedis shardedJedis = (ShardedJedis) obj;
((ShardedJedis) obj).disconnect(); for (Jedis jedis : shardedJedis.getAllShards()) {
} catch (Exception e) { try {
try {
jedis.quit();
} catch (Exception e) {
}
jedis.disconnect();
} catch (Exception e) {
}
} }
} }
} }