Ensure LocalNode to be stoped before shutting down the NeoSystem

neo-project · Feb 20, 2019 · 2bff318 · jsolman · Mar 1, 2019 · jsolman
1 parent d9fc9e9
commit 2bff318
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/neo/NeoSystem.cs b/neo/NeoSystem.cs
@@ -8,6 +8,7 @@
 using Neo.Wallets;
 using System;
 using System.Net;
+using System.Threading;
 
 namespace Neo
 {
@@ -40,10 +41,18 @@ public NeoSystem(Store store)
         public void Dispose()
         {
             RpcServer?.Dispose();
-            ActorSystem.Stop(LocalNode);
+            EnsureStoped(LocalNode);
             ActorSystem.Dispose();
         }
 
+        public void EnsureStoped(IActorRef actor)
+        {
+            Inbox inbox = Inbox.Create(ActorSystem);
+            inbox.Watch(actor);
+            ActorSystem.Stop(actor);
+            inbox.Receive(Timeout.InfiniteTimeSpan);
+        }
+
         internal void ResumeNodeStartup()
         {
             suspend = false;