close #4099 - made ActorSystem.Dispose method block until WhenTermina…

…ted.IsComplete == true (#4105)
akkadotnet · Dec 20, 2019 · a389364 · a389364
1 parent 58076c3
commit a389364
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/core/Akka/Actor/ActorSystem.cs b/src/core/Akka/Actor/ActorSystem.cs
@@ -214,13 +214,6 @@ private static ActorSystem CreateAndStartSystem(string name, Config withFallback
 
         private bool _isDisposed; //Automatically initialized to false;
 
-        //Destructor:
-        //~ActorSystem() 
-        //{
-        //    // Finalizer calls Dispose(false)
-        //    Dispose(false);
-        //}
-
         /// <inheritdoc/>
         public void Dispose()
         {
@@ -244,7 +237,7 @@ private void Dispose(bool disposing)
                     if (disposing)
                     {
                         Log.Debug("Disposing system");
-                        Terminate();
+                        Terminate().Wait(); // System needs to be disposed before method returns
                     }
                     //Clean up unmanaged resources
                 }