From 6c0e2e249ddbab24c67b655b701e473d9343c2ef Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Wed, 27 Mar 2019 16:13:36 +0100
Subject: [PATCH] Even more duplicate code removed

---
 .../Session/SessionManager.cs                 | 56 ++-----------------
 1 file changed, 6 insertions(+), 50 deletions(-)

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index b7974dd7e8..6b9573b1dd 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1242,12 +1242,13 @@ namespace Emby.Server.Implementations.Session
             return SendMessageToSession(session, "Playstate", command, cancellationToken);
         }
 
-        private void AssertCanControl(SessionInfo session, SessionInfo controllingSession)
+        private static void AssertCanControl(SessionInfo session, SessionInfo controllingSession)
         {
             if (session == null)
             {
                 throw new ArgumentNullException(nameof(session));
             }
+
             if (controllingSession == null)
             {
                 throw new ArgumentNullException(nameof(controllingSession));
@@ -1259,26 +1260,11 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public async Task SendRestartRequiredNotification(CancellationToken cancellationToken)
+        public Task SendRestartRequiredNotification(CancellationToken cancellationToken)
         {
             CheckDisposed();
 
-            var sessions = Sessions.ToList();
-
-            var tasks = sessions.Select(session => Task.Run(async () =>
-            {
-                try
-                {
-                    await SendMessageToSession(session, "RestartRequired", string.Empty, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError("Error in SendRestartRequiredNotification.", ex);
-                }
-
-            }, cancellationToken)).ToArray();
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
+            return SendMessageToSessions(Sessions, "RestartRequired", string.Empty, cancellationToken);
         }
 
         /// <summary>
@@ -1290,22 +1276,7 @@ namespace Emby.Server.Implementations.Session
         {
             CheckDisposed();
 
-            var sessions = Sessions.ToList();
-
-            var tasks = sessions.Select(session => Task.Run(async () =>
-            {
-                try
-                {
-                    await SendMessageToSession(session, "ServerShuttingDown", string.Empty, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError("Error in SendServerShutdownNotification.", ex);
-                }
-
-            }, cancellationToken)).ToArray();
-
-            return Task.WhenAll(tasks);
+            return SendMessageToSessions(Sessions, "ServerShuttingDown", string.Empty, cancellationToken);
         }
 
         /// <summary>
@@ -1319,22 +1290,7 @@ namespace Emby.Server.Implementations.Session
 
             _logger.LogDebug("Beginning SendServerRestartNotification");
 
-            var sessions = Sessions.ToList();
-
-            var tasks = sessions.Select(session => Task.Run(async () =>
-            {
-                try
-                {
-                    await SendMessageToSession(session, "ServerRestarting", string.Empty, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError("Error in SendServerRestartNotification.", ex);
-                }
-
-            }, cancellationToken)).ToArray();
-
-            return Task.WhenAll(tasks);
+            return SendMessageToSessions(Sessions, "ServerRestarting", string.Empty, cancellationToken);
         }
 
         /// <summary>