close akkadotnet#48 - fixed source of NRE upon shutdown

Aaronontheweb · May 19, 2022 · 09d23bd · 09d23bd
1 parent cc417e8
commit 09d23bd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Akka.Hosting/AkkaHostedService.cs b/src/Akka.Hosting/AkkaHostedService.cs
@@ -14,6 +14,7 @@ namespace Akka.Hosting
     internal sealed class AkkaHostedService : IHostedService
     {
         private ActorSystem _actorSystem;
+        private CoordinatedShutdown _coordinatedShutdown; // grab a reference to CoordinatedShutdown early
         private readonly IServiceProvider _serviceProvider;
         private readonly AkkaConfigurationBuilder _configurationBuilder;
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
@@ -33,6 +34,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             try
             {
                 _actorSystem = _serviceProvider.GetRequiredService<ActorSystem>();
+                _coordinatedShutdown = CoordinatedShutdown.Get(_actorSystem);
                 await _configurationBuilder.StartAsync(_actorSystem);
 
                 async Task TerminationHook()
@@ -57,7 +59,7 @@ async Task TerminationHook()
         public async Task StopAsync(CancellationToken cancellationToken)
         {
             // run full CoordinatedShutdown on the Sys
-            await CoordinatedShutdown.Get(_actorSystem).Run(CoordinatedShutdown.ClrExitReason.Instance)
+            await _coordinatedShutdown.Run(CoordinatedShutdown.ClrExitReason.Instance)
                 .ConfigureAwait(false);
         }
     }