aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs2
-rw-r--r--MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index 534d6aff1..fdb27d40d 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -120,7 +120,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
{
var endpoint = ctx.Request.RemoteEndPoint.ToString();
var url = ctx.Request.RawUrl;
- var queryString = new NameValueCollection(ctx.Request.QueryString);
+ var queryString = new NameValueCollection(ctx.Request.QueryString ?? new NameValueCollection());
var connectingArgs = new WebSocketConnectingEventArgs
{
diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index 6428d10a9..8719f5448 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -147,7 +147,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
{
OnReceive = ProcessWebSocketMessageReceived,
Url = e.Url,
- QueryString = new NameValueCollection(e.QueryString)
+ QueryString = new NameValueCollection(e.QueryString ?? new NameValueCollection())
};
_webSocketConnections.Add(connection);