Merge PR #203: Handle System>>#exit: properly for async apps

smarr · Dec 18, 2017 · 3589aff · 3589aff
2 parents 9bdd435 + ee6a79b
commit 3589aff
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/som/vm/ObjectSystem.java b/src/som/vm/ObjectSystem.java
@@ -341,7 +341,7 @@ private static void setSlot(final SObject obj, final String slotName,
   private void handlePromiseResult(final SPromise promise) {
     int emptyFJPool = 0;
     while (emptyFJPool < 120) {
-      if (promise.isCompleted() || vm.shouldExit()) {
+      if (promise.isCompleted()) {
         if (vm.isAvoidingExit()) {
           return;
         }
@@ -353,6 +353,13 @@ private void handlePromiseResult(final SPromise promise) {
         }
       }
 
+      if (vm.shouldExit()) {
+        if (vm.isAvoidingExit()) {
+          return;
+        }
+        vm.shutdownAndExit(vm.lastExitCode());
+      }
+
       try {
         Thread.sleep(500);
       } catch (InterruptedException e) {}