JavaIsJavaScript
diff --git a/‎src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java‎
Lines changed: 5 additions & 5 deletions b/‎src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java‎
Lines changed: 5 additions & 5 deletions
@@ -28,7 +28,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -129,7 +129,10 @@ public <T extends ResponseType> void prepare(RequestType request, Class<T> respo
     }
 
     public void process() {
-        Collection<ResponseContext> values = responseContextMap.values();
+        // copy the values in a new list to be iterated over, because otherwise we get a ConcurrentModificationException,
+        // since the onMessage(..) uses the same responseContextMap to remove an item while looping over its items here.
+        ArrayList<ResponseContext> values = new ArrayList<>(responseContextMap.values());
+
         receivedResponsesSignal = new CountDownLatch(values.size());
 
         // send all messages
@@ -147,9 +150,6 @@ public void process() {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
-
-        // we processed everything in the map, clear it such that the map is empty for the next process call
-        responseContextMap.clear();
     }
 
     public void close() {