SAMZA-2461 Fix: Concurrent Modification Exception in InMemorySystem (a…

…pache#1280)
voronenko-da · Feb 24, 2020 · 6d411a5 · 6d411a5
1 parent 3ef1c67
commit 6d411a5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/samza-core/src/main/java/org/apache/samza/system/inmemory/InMemoryManager.java b/samza-core/src/main/java/org/apache/samza/system/inmemory/InMemoryManager.java
@@ -20,6 +20,7 @@
 package org.apache.samza.system.inmemory;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -199,6 +200,6 @@ private List<IncomingMessageEnvelope> poll(SystemStreamPartition ssp, String off
       return new ArrayList<>();
     }
 
-    return messageEnvelopesForSSP.subList(startingOffset, messageEnvelopesForSSP.size());
+    return ImmutableList.copyOf(messageEnvelopesForSSP.subList(startingOffset, messageEnvelopesForSSP.size()));
   }
 }