Merge pull request #5 from jellyfin/master

Merge up to latest master

2 files changed, 3 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 844412546..ee5c1a165 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -57,7 +57,7 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         /// <param name="message">The message.</param>
         /// <returns>Task.</returns>
-        public Task ProcessMessage(WebSocketMessageInfo message)
+        public Task ProcessMessageAsync(WebSocketMessageInfo message)
         {
             if (message == null)
             {
@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Net
                 Stop(message);
             }
 
-            return Task.FromResult(true);
+            return Task.CompletedTask;
         }
 
         protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
diff --git a/MediaBrowser.Controller/Net/IWebSocketListener.cs b/MediaBrowser.Controller/Net/IWebSocketListener.cs
index e38f0e259..0f472a2bc 100644
--- a/MediaBrowser.Controller/Net/IWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketListener.cs
@@ -12,6 +12,6 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         /// <param name="message">The message.</param>
         /// <returns>Task.</returns>
-        Task ProcessMessage(WebSocketMessageInfo message);
+        Task ProcessMessageAsync(WebSocketMessageInfo message);
     }
 }