Fix concurrent modification exception

neelam-kushwah · Jun 7, 2024 · b23e2fe · b23e2fe
1 parent 3b9cf78
commit b23e2fe
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/app/src/main/java/org/eclipse/uprotocol/simulatorproxy/SimulatorProxyService.java b/app/src/main/java/org/eclipse/uprotocol/simulatorproxy/SimulatorProxyService.java
@@ -77,6 +77,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -215,19 +216,23 @@ static void sendTopicUpdateToHost(UMessage umessage) {
             jsonObj.put(Constants.ACTION_DATA, serializedMsg);
             List<Socket> socketList = Constants.TOPIC_SOCKET_MAP.get(topic);
             if (socketList != null) {
-                socketList.forEach(socket -> {
-                    try {
-                        PrintWriter wr = new PrintWriter(socket.getOutputStream());
-                        wr.println(jsonObj);
-                        wr.flush();
-                        Log.d(LOG_TAG, "Sending topic update to host: " + jsonObj);
-
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        // Log the exception and continue with the next socket
-                        Log.e(LOG_TAG, "Exception occurs while sending topic update to host", e);
+                synchronized (socketList) {
+                    Iterator<Socket> iterator = socketList.iterator();
+                    while (iterator.hasNext()) {
+                        Socket socket = iterator.next();
+                        try {
+                            PrintWriter wr = new PrintWriter(socket.getOutputStream());
+                            wr.println(jsonObj);
+                            wr.flush();
+                            Log.d(LOG_TAG, "Sending topic update to host: " + jsonObj);
+
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            // Log the exception and continue with the next socket
+                            Log.e(LOG_TAG, "Exception occurs while sending topic update to host", e);
+                        }
                     }
-                });
+                }
             }
 
         } catch (JSONException e) {