reduce uses of Task.Run

4 files changed, 47 insertions, 54 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
index 4c7dd1da6..87a01ef7d 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
@@ -282,58 +282,54 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 return;
             }
 
+            RaiseReceiveWebRequest(context);
 
-            Task.Run(() =>
+            try
             {
-                RaiseReceiveWebRequest(context);
-
-                try
-                {
-                    ProcessRequest(context);
-                }
-                catch (InvalidOperationException ex)
-                {
-                    HandleException(context.Response, ex, 422);
+                ProcessRequest(context);
+            }
+            catch (InvalidOperationException ex)
+            {
+                HandleException(context.Response, ex, 422);
 
-                    throw;
-                }
-                catch (ResourceNotFoundException ex)
-                {
-                    HandleException(context.Response, ex, 404);
+                throw;
+            }
+            catch (ResourceNotFoundException ex)
+            {
+                HandleException(context.Response, ex, 404);
 
-                    throw;
-                }
-                catch (FileNotFoundException ex)
-                {
-                    HandleException(context.Response, ex, 404);
+                throw;
+            }
+            catch (FileNotFoundException ex)
+            {
+                HandleException(context.Response, ex, 404);
 
-                    throw;
-                }
-                catch (DirectoryNotFoundException ex)
-                {
-                    HandleException(context.Response, ex, 404);
+                throw;
+            }
+            catch (DirectoryNotFoundException ex)
+            {
+                HandleException(context.Response, ex, 404);
 
-                    throw;
-                }
-                catch (UnauthorizedAccessException ex)
-                {
-                    HandleException(context.Response, ex, 401);
+                throw;
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                HandleException(context.Response, ex, 401);
 
-                    throw;
-                }
-                catch (ArgumentException ex)
-                {
-                    HandleException(context.Response, ex, 400);
+                throw;
+            }
+            catch (ArgumentException ex)
+            {
+                HandleException(context.Response, ex, 400);
 
-                    throw;
-                }
-                catch (Exception ex)
-                {
-                    HandleException(context.Response, ex, 500);
+                throw;
+            }
+            catch (Exception ex)
+            {
+                HandleException(context.Response, ex, 500);
 
-                    throw;
-                }
-            });
+                throw;
+            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 3ec881499..6436e7716 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             UpdateLibraryCache(args);
 
-            EventHelper.QueueEventIfNotNull(LibraryChanged, this, args, _logger);
+            EventHelper.FireEventIfNotNull(LibraryChanged, this, args, _logger);
         }
         #endregion
 
diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs
index f55b13d19..75bb42774 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs
@@ -195,17 +195,14 @@ namespace MediaBrowser.Server.Implementations.Sqlite
                 throw new ArgumentNullException("cancellationToken");
             }
 
-            return Task.Run(() =>
-            {
-                cancellationToken.ThrowIfCancellationRequested();
+            cancellationToken.ThrowIfCancellationRequested();
 
-                var cmd = connection.CreateCommand();
-                cmd.CommandText = "delete from users where guid=@guid";
-                var guidParam = cmd.Parameters.Add("@guid", DbType.Guid);
-                guidParam.Value = user.Id;
+            var cmd = connection.CreateCommand();
+            cmd.CommandText = "delete from users where guid=@guid";
+            var guidParam = cmd.Parameters.Add("@guid", DbType.Guid);
+            guidParam.Value = user.Id;
 
-                return ExecuteCommand(cmd);
-            });
+            return ExecuteCommand(cmd);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/WebSocket/AlchemyWebSocket.cs b/MediaBrowser.Server.Implementations/WebSocket/AlchemyWebSocket.cs
index 7bf1fe86d..0b6b14566 100644
--- a/MediaBrowser.Server.Implementations/WebSocket/AlchemyWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/WebSocket/AlchemyWebSocket.cs
@@ -1,11 +1,11 @@
 using Alchemy.Classes;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
 using System;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Net;
 
 namespace MediaBrowser.Server.Implementations.WebSocket
 {