From c81bdc08491932caadee59fa8582b7703d5fced7 Mon Sep 17 00:00:00 2001
From: Nelson Rodrigues <nelson@nelsonjrodrigues.com>
Date: Mon, 28 Jul 2014 11:45:34 -0700
Subject: [PATCH] Properly close jedis connection in case of exceptions

---
 .../java/redis/clients/jedis/JedisSentinelPool.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/JedisSentinelPool.java b/src/main/java/redis/clients/jedis/JedisSentinelPool.java
index c80ae8e..9138cc0 100644
--- a/src/main/java/redis/clients/jedis/JedisSentinelPool.java
+++ b/src/main/java/redis/clients/jedis/JedisSentinelPool.java
@@ -126,20 +126,24 @@ public class JedisSentinelPool extends Pool<Jedis> {
 
 		log.fine("Connecting to Sentinel " + hap);
 
+		Jedis jedis = null;
 		try {
-		    Jedis jedis = new Jedis(hap.getHost(), hap.getPort());
+		    jedis = new Jedis(hap.getHost(), hap.getPort());
 
 		    if (master == null) {
 			master = toHostAndPort(jedis
 				.sentinelGetMasterAddrByName(masterName));
 			log.fine("Found Redis master at " + master);
-			jedis.disconnect();
 			break outer;
 		    }
 		} catch (JedisConnectionException e) {
 		    log.warning("Cannot connect to sentinel running @ " + hap
 			    + ". Trying next one.");
-		}
+		} finally {
+		    if (jedis != null) {
+	        jedis.close();
+		    }
+		}		
 	    }
 
 	    try {