rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary if state

Browse Source
This commit is contained in:
Jungtaek Lim
2014-10-05 10:52:05 +09:00
parent c5336310bd
commit 9c296000a2
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/redis/clients/jedis/JedisSentinelPool.java
View File

@@ -127,23 +127,21 @@ public class JedisSentinelPool extends Pool<Jedis> {
try { try {
jedis = new Jedis(hap.getHost(), hap.getPort()); jedis = new Jedis(hap.getHost(), hap.getPort());
if (master == null) { List<String> masterAddr = jedis
List<String> masterAddr = jedis .sentinelGetMasterAddrByName(masterName);
.sentinelGetMasterAddrByName(masterName);
// connected to sentinel... // connected to sentinel...
sentinelAvailable = true; sentinelAvailable = true;
if (masterAddr == null || masterAddr.size() != 2) { if (masterAddr == null || masterAddr.size() != 2) {
log.warning("Can not get master addr, master name: " log.warning("Can not get master addr, master name: "
+ masterName + ". Sentinel: " + hap + "."); + masterName + ". Sentinel: " + hap + ".");
continue; continue;
}
master = toHostAndPort(masterAddr);
log.fine("Found Redis master at " + master);
break;
} }
master = toHostAndPort(masterAddr);
log.fine("Found Redis master at " + master);
break;
} catch (JedisConnectionException e) { } catch (JedisConnectionException e) {
log.warning("Cannot connect to sentinel running @ " + hap log.warning("Cannot connect to sentinel running @ " + hap
+ ". Trying next one."); + ". Trying next one.");