From 9a36a5badc5331a76184c7ede70ae67e38f8b3b3 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 21 Mar 2018 16:04:39 +0300
Subject: [PATCH] Fixed - NPE during failover in Sentinel mode. #1317

---
 .../org/redisson/connection/SentinelConnectionManager.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index bdb0158f1..4b7cae761 100755
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@@ -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]);
                             }