stop instead of restart (#1966)

asynkron · Apr 4, 2023 · d2ed63b · d2ed63b
1 parent 9736e45
commit d2ed63b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/Proto.Actor/Context/ActorContext.cs b/src/Proto.Actor/Context/ActorContext.cs
@@ -670,6 +670,13 @@ private IActor IncarnateActor()
 
     private async ValueTask HandleRestartAsync()
     {
+        //restart invoked but system is stopping. stop the actor
+        if (System.Shutdown.IsCancellationRequested)
+        {
+            await HandleStopAsync();
+            return;
+        }
+
         _state = ContextState.Restarting;
         CancelReceiveTimeout();
         await InvokeUserMessageAsync(Restarting.Instance).ConfigureAwait(false);