* Fixed bug where callin Cleanup sometimes caused a crash due to modifying a collection that was being used in a enumerator. (#106)

Author: Olof Andreassen

Src/SocketIoClientDotNet.net45/Client/Manager.cs

@@ -3,6 +3,7 @@
 using Quobject.EngineIoClientDotNet.Modules;
 using Quobject.EngineIoClientDotNet.Thread;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
 
@@ -45,7 +46,7 @@ public enum ReadyStateEnum
         private int Attempts;
         private Uri Uri;
         private List<Parser.Packet> PacketBuffer;
-        private Queue<On.IHandle> Subs;
+        private ConcurrentQueue<On.IHandle> Subs;
         private Quobject.EngineIoClientDotNet.Client.Socket.Options Opts;
         private bool AutoConnect;
         private HashSet<Socket> OpeningSockets;
@@ -87,7 +88,7 @@ public Manager(Uri uri, Options opts)
             }
             this.Opts = opts;
             this.Nsps = ImmutableDictionary.Create<string, Socket>();
-            this.Subs = new Queue<On.IHandle>();
+            this.Subs = new ConcurrentQueue<On.IHandle>();
             this.Reconnection(opts.Reconnection);
             this.ReconnectionAttempts(opts.ReconnectionAttempts != 0 ? opts.ReconnectionAttempts : int.MaxValue);
             this.ReconnectionDelay(opts.ReconnectionDelay != 0 ? opts.ReconnectionDelay : 1000);
@@ -394,11 +395,11 @@ private void ProcessPacketQueue()
 
         private void Cleanup()
         {
+            // Concurrent-queue makes a copy when calling GetEnumerator
+            // which protects it from any changes done in Subs while calling destroy
             foreach (var sub in Subs)
             {
-                lock (Subs) {
-                    sub.Destroy();
-                }
+                sub.Destroy();
             }
         }
 

Src/SocketIoClientDotNet.net45/SocketIoClientDotNet.net45.csproj

@@ -31,23 +31,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EngineIoClientDotNet, Version=0.10.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\EngineIoClientDotNet.0.10.1-beta2\lib\net45\EngineIoClientDotNet.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\EngineIoClientDotNet.0.10.1-beta2\lib\net45\EngineIoClientDotNet.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SuperSocket.ClientEngine, Version=0.8.0.6, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\SuperSocket.ClientEngine.Core.0.8.0.6\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\SuperSocket.ClientEngine.Core.0.8.0.6\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
     <Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\WebSocket4Net.0.15.0-beta6\lib\net45\WebSocket4Net.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta6\lib\net45\WebSocket4Net.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

Src/SocketIoClientDotNet.net45/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EngineIoClientDotNet" version="0.10.1-beta2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.15.0-beta6" targetFramework="net45" />
 </packages>