From a69dd4e2429b86dc901dea63b84a509387d27a45 Mon Sep 17 00:00:00 2001
From: Marcos Nils <marcosnils@gmail.com>
Date: Wed, 5 Feb 2014 00:06:29 -0300
Subject: [PATCH] Add exception handling in caso of unexecpected errors

---
 .../clients/jedis/JedisClusterConnectionHandler.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java b/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
index 15d5d41..d30b5f7 100644
--- a/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
+++ b/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
@@ -28,10 +28,12 @@ public abstract class JedisClusterConnectionHandler {
 		    hostAndPort.getPort());
 	    this.nodes.put(hostAndPort.getHost() + hostAndPort.getPort(), jp);
 	    Jedis jedis = jp.getResource();
-	    discoverClusterNodesAndSlots(jedis);
-	    jp.returnResource(jedis);
+	    try {
+		discoverClusterNodesAndSlots(jedis);
+	    } finally {
+		jp.returnResource(jedis);
+	    }
 	}
-
     }
 
     private void discoverClusterNodesAndSlots(Jedis jedis) {