Fixed - ArrayIndexOutOfBoundsException is thrown if master change was…

… unsuccessful. redisson#3460
yxc6123 · Mar 25, 2021 · 0899f52 · 0899f52
1 parent 769f0b1
commit 0899f52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
@@ -35,7 +35,8 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
@@ -51,7 +52,7 @@ abstract class ConnectionPool<T extends RedisConnection> {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    protected final List<ClientConnectionsEntry> entries = new CopyOnWriteArrayList<ClientConnectionsEntry>();
+    protected final Queue<ClientConnectionsEntry> entries = new ConcurrentLinkedQueue<>();
 
     final ConnectionManager connectionManager;
 

diff --git a/redisson/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java
@@ -38,7 +38,7 @@ public MasterConnectionPool(MasterSlaveServersConfig config,
 
     @Override
     public RFuture<RedisConnection> get(RedisCommand<?> command) {
-        return acquireConnection(command, entries.get(0));
+        return acquireConnection(command, entries.peek());
     }
 
     public void remove(ClientConnectionsEntry entry) {

diff --git a/redisson/src/main/java/org/redisson/connection/pool/MasterPubSubConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/MasterPubSubConnectionPool.java
@@ -38,7 +38,7 @@ public MasterPubSubConnectionPool(MasterSlaveServersConfig config, ConnectionMan
 
     @Override
     public RFuture<RedisPubSubConnection> get(RedisCommand<?> command) {
-        return acquireConnection(command, entries.get(0));
+        return acquireConnection(command, entries.peek());
     }
 
     public void remove(ClientConnectionsEntry entry) {