fix issue #642

2014-05-23 16:18:07 +08:00
parent 268706b65c
commit ab2f43b8c0
2 changed files with 34 additions and 3 deletions
--- a/src/main/java/redis/clients/jedis/JedisSentinelPool.java
+++ b/src/main/java/redis/clients/jedis/JedisSentinelPool.java
@@ -130,10 +130,17 @@ public class JedisSentinelPool extends Pool<Jedis> {

 				try {
 					Jedis jedis = new Jedis(hap.getHost(), hap.getPort());
-
 					if (master == null) {
-						master = toHostAndPort(jedis
-								.sentinelGetMasterAddrByName(masterName));
+						List<String> masterAddr = jedis
+								.sentinelGetMasterAddrByName(masterName);
+						if (masterAddr == null || masterAddr.size() != 2) {
+							log.warning("Can not get master addr, master name: "
+									+ masterName + ". Sentinel: " + hap + ".");
+							jedis.disconnect();
+							continue;
+						}
+
+						master = toHostAndPort(masterAddr);
 						log.fine("Found Redis master at " + master);
 						jedis.disconnect();
 						break outer;