Fixed - NPE during failover in Sentinel mode. #1317

pull/1423/head
Nikita 7 years ago
parent 8bf791004c
commit 9a36a5badc

@ -351,7 +351,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
slaveDown(ip, port);
continue;
}
if (!isUseSameMaster(ip, port, masterHost, masterPort)) {
if (masterHost.equals("?") || !isUseSameMaster(ip, port, masterHost, masterPort)) {
continue;
}
@ -367,7 +367,6 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
Set<String> removedSlaves = new HashSet<String>(slaves);
removedSlaves.removeAll(currentSlaves);
for (String slave : removedSlaves) {
slaves.remove(slave);
String[] parts = slave.replace("redis://", "").split(":");
slaveDown(parts[0], parts[1]);
}

Loading…
Cancel
Save