#6560: fix problem with removing session

twosigma · Jan 25, 2018 · c994d35 · c994d35
1 parent 56c89b2
commit c994d35
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 19 deletions.
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java b/kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
@@ -17,6 +17,7 @@
 
 import com.google.common.collect.Lists;
 import com.twosigma.beakerx.DefaultJVMVariables;
+import com.twosigma.beakerx.NamespaceClient;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.jvm.threads.CellExecutor;
 import com.twosigma.beakerx.kernel.AddImportStatus;
@@ -208,6 +209,7 @@ public Path getTempFolder() {
 
   @Override
   public void exit() {
+    NamespaceClient.delBeaker(getSessionId());
     removeTempFolder();
   }
 

diff --git a/kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyWorkerThread.java b/kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyWorkerThread.java
@@ -72,12 +72,6 @@ public TryResult call() throws Exception {
         nc = null;
       }
     }
-    NamespaceClient.delBeaker(groovyEvaluator.getSessionId());
     return r;
   }
-
-  void doExit() {
-    //  this.exit = true;
-  }
-
 }
diff --git a/kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaWorkerThread.java b/kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaWorkerThread.java
@@ -51,12 +51,6 @@ public TryResult call() throws Exception {
         nc = null;
       }
     }
-
-    NamespaceClient.delBeaker(javaEvaluator.getSessionId());
     return r;
   }
-
-  public void doExit() {
-  }
-
 }
diff --git a/kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinWorkerThread.java b/kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinWorkerThread.java
@@ -69,7 +69,6 @@ public TryResult call() throws Exception {
         nc = null;
       }
     }
-    NamespaceClient.delBeaker(kotlinEvaluator.getSessionId());
     return either;
   }
 

diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaWorkerThread.java b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaWorkerThread.java
@@ -62,12 +62,6 @@ public TryResult call() throws Exception {
         nc = null;
       }
     }
-
-    NamespaceClient.delBeaker(scalaEvaluator.getSessionId());
     return either;
   }
-
-  public void doExit() {
-
-  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ public TryResult call() throws Exception { @@
             nc = null;
           }
         }
-        NamespaceClient.delBeaker(kotlinEvaluator.getSessionId());
         return either;
       }
@@ Expand Down @@