#kernel_base_12: switch interrupting mode to message

twosigma · Jul 31, 2020 · afdb5bc · afdb5bc
1 parent ba296c3
commit afdb5bc
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/base/src/main/java/com/twosigma/beakerx/kernel/handler/ExecuteRequestHandler.java b/base/src/main/java/com/twosigma/beakerx/kernel/handler/ExecuteRequestHandler.java
@@ -121,13 +121,19 @@ public void exit() {
   }
 
   public void interruptKernel() {
-    try {
-      current.get();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
+    waitForTheEndOfTheCurrentCell();
     List<Runnable> cells = executorService.shutdownNow();
     cells.forEach(Runnable::run);
     executorService = Executors.newFixedThreadPool(1);
   }
+
+  private void waitForTheEndOfTheCurrentCell() {
+    if (current != null) {
+      try {
+        current.get();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
 }