Merge PR #310: Fix termination in Launcher and of Fork/Join Pools

smarr · Aug 7, 2019 · 6fc630a · 6fc630a
2 parents db2922c + 132b20e
commit 6fc630a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/som/Launcher.java b/src/som/Launcher.java
@@ -44,7 +44,7 @@ public static void main(final String[] args) {
       exitCode = result.as(Integer.class);
     } finally {
       context.eval(SHUTDOWN);
-      context.close(true);
+      context.close();
       finalizeExecution(exitCode);
     }
 

diff --git a/src/som/VM.java b/src/som/VM.java
@@ -251,7 +251,7 @@ private void shutdownPools() {
         new ForkJoinPool[] {actorPool, processesPool, forkJoinPool, threadPool};
 
     for (ForkJoinPool pool : pools) {
-      pool.shutdown();
+      pool.shutdownNow();
       try {
         pool.awaitTermination(10, TimeUnit.SECONDS);
       } catch (InterruptedException e) {