Merge pull request #96 from Netflix/bugfix/duet_read_exclude

Fix for addAll throwing UnsupportedException in the event it gets applied on top of SingletonList
Netflix · Oct 8, 2020 · 0e8b973 · 0e8b973
2 parents c5c249c + b8c8c03
commit 0e8b973
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/evcache-core/src/main/java/com/netflix/evcache/pool/EVCacheClientPool.java b/evcache-core/src/main/java/com/netflix/evcache/pool/EVCacheClientPool.java
@@ -315,11 +315,13 @@ public List<EVCacheClient> getAllEVCacheClientForRead() {
             return evCacheClients;
 
         if (duetPrimary.get()) {
-            duetEVCacheClients.addAll(evCacheClients);
-            return duetEVCacheClients;
+            List<EVCacheClient> clients = new ArrayList<>(duetEVCacheClients);
+            clients.addAll(evCacheClients);
+            return clients;
         } else {
-            evCacheClients.addAll(duetEVCacheClients);
-            return evCacheClients;
+            List<EVCacheClient> clients = new ArrayList<>(evCacheClients);
+            clients.addAll(duetEVCacheClients);
+            return clients;
         }
     }
 
@@ -485,11 +487,13 @@ public List<EVCacheClient> getEVCacheClientsForReadExcluding(ServerGroup serverG
             return evCacheClients;
 
         if (duetPrimary.get()) {
-            duetEVCacheClients.addAll(evCacheClients);
-            return duetEVCacheClients;
+            List<EVCacheClient> clients = new ArrayList<>(duetEVCacheClients);
+            clients.addAll(evCacheClients);
+            return clients;
         } else {
-            evCacheClients.addAll(duetEVCacheClients);
-            return evCacheClients;
+            List<EVCacheClient> clients = new ArrayList<>(evCacheClients);
+            clients.addAll(duetEVCacheClients);
+            return clients;
         }
     }