From 78fd22319d0d2bd57c6e904338e2ddd9043c83dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20W=C3=B3dke?= <maciej.wodke@pracuj.pl>
Date: Tue, 4 Jun 2019 16:29:27 +0200
Subject: [PATCH] Removed return of force exit task in coordinated shutdown,
 which caused timeout #3815

---
 src/core/Akka/Actor/CoordinatedShutdown.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/Akka/Actor/CoordinatedShutdown.cs b/src/core/Akka/Actor/CoordinatedShutdown.cs
index bb0d7fd8760..176aac71e15 100644
--- a/src/core/Akka/Actor/CoordinatedShutdown.cs
+++ b/src/core/Akka/Actor/CoordinatedShutdown.cs
@@ -626,13 +626,12 @@ internal static void InitPhaseActorSystemTerminate(ActorSystem system, Config co
                         // We must spawn a separate Task to not block current thread,
                         // since that would have blocked the shutdown of the ActorSystem.
                         var timeout = coord.Timeout(PhaseActorSystemTerminate);
-                        return Task.Run(() =>
+                        Task.Run(() =>
                         {
                             if (!system.WhenTerminated.Wait(timeout) && !coord._runningClrHook)
                             {
                                 Environment.Exit(0);
                             }
-                            return Done.Instance;
                         });
                     }