Merge remote-tracking branch 'upstream/dev' into build-system-consolidation

1 files changed, 10 insertions, 7 deletions

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 31ec149bf..b97b2f97d 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Threading;
 using System.Collections.Generic;
 using System.Globalization;
@@ -50,7 +50,7 @@ namespace MediaBrowser.Controller.Net
         {
             if (logger == null)
             {
-                throw new ArgumentNullException("logger");
+                throw new ArgumentNullException(nameof(logger));
             }
 
             Logger = logger;
@@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Net
         {
             if (message == null)
             {
-                throw new ArgumentNullException("message");
+                throw new ArgumentNullException(nameof(message));
             }
 
             if (string.Equals(message.MessageType, Name + "Start", StringComparison.OrdinalIgnoreCase))
@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Net
 
         protected virtual void ParseMessageParams(string[] values)
         {
-            
+
         }
 
         /// <summary>
@@ -269,7 +269,7 @@ namespace MediaBrowser.Controller.Net
                 }
                 catch (ObjectDisposedException)
                 {
-
+                    //TODO Investigate and properly fix.
                 }
             }
 
@@ -280,10 +280,13 @@ namespace MediaBrowser.Controller.Net
             }
             catch (ObjectDisposedException)
             {
-
+                //TODO Investigate and properly fix.
             }
 
-            ActiveConnections.Remove(connection);
+            lock (ActiveConnections)
+            {
+                ActiveConnections.Remove(connection);
+            }
         }
 
         /// <summary>