Remove listeners during slave down process handling. #945

redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java

@@ -112,6 +112,11 @@ public class ClientConnectionsEntry {
         this.freezed = freezed;
     }
     
+    public void reset() {
+        freeConnectionsCounter.removeListeners();
+        freeSubscribeConnectionsCounter.removeListeners();
+    }
+
     public int getFreeAmount() {
         return freeConnectionsCounter.getCounter();
     }

redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java

@@ -143,6 +143,8 @@ public class MasterSlaveEntry {
             }
         }
         
+        entry.reset();
+        
         // close all connections
         while (true) {
             final RedisConnection connection = entry.pollConnection();

redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java

@@ -17,8 +17,6 @@ package org.redisson.pubsub;
 
 import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
@@ -58,6 +56,12 @@ public class AsyncSemaphore {
         }
     }
     
+    public void removeListeners() {
+        synchronized (this) {
+            listeners.clear();
+        }
+    }
+    
     public void acquire(Runnable listener) {
         boolean run = false;