Fix #23 [BUG] Calling close on Server raises ConcurrentModificationError

rikulo · Jun 19, 2020 · 33d2dc9 · 33d2dc9
1 parent 56f7e3a
commit 33d2dc9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.9.4
+
+**Bug Fix:**
+
+* [#23](https://github.com/rikulo/socket.io-dart/issues/23) [BUG] Calling close on Server raises ConcurrentModificationError
+
 ## 0.9.3
 
 **Bug Fix:**

diff --git a/lib/src/engine/server.dart b/lib/src/engine/server.dart
@@ -176,7 +176,7 @@ class Server extends Engine {
   @override
   void close() {
     _logger.fine('closing all open clients');
-    for (var key in clients.keys) {
+    for (var key in clients.keys.toList(growable: false)) {
       if (clients[key] != null) {
         clients[key].close(true);
       }

diff --git a/lib/src/server.dart b/lib/src/server.dart
@@ -371,7 +371,7 @@ class Server {
   ///
   /// @api public
   void close() {
-    nsps['/'].sockets.forEach((socket) {
+    nsps['/'].sockets.toList(growable: false).forEach((socket) {
       socket.onclose();
     });
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: socket_io
 description: >
   Port of JS/Node library Socket.io. It enables real-time, bidirectional and 
   event-based communication cross-platform.
-version: 0.9.3
+version: 0.9.4
 author: jumperchen <[email protected]>
 homepage: https://www.zkoss.org
 repository: https://github.com/rikulo/socket.io-dart