Restore execution environment before the execution complete notificat…

…ion (#7980) Fixes flaky RuntimeServerTest https://github.com/enso-org/enso/actions/runs/6410804439/job/17420283503?pr=7953#step:10:4004
enso-org · Oct 5, 2023 · f135637 · f135637
1 parent 5a1aaed
commit f135637
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ExecuteJob.scala b/...ime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ExecuteJob.scala
@@ -39,7 +39,11 @@ class ExecuteJob(
       executionEnvironment.foreach(env =>
         context.setExecutionEnvironment(ExecutionEnvironment.forName(env.name))
       )
-      val outcome = ProgramExecutionSupport.runProgram(contextId, stack)
+      val outcome =
+        try ProgramExecutionSupport.runProgram(contextId, stack)
+        finally {
+          originalExecutionEnvironment.foreach(context.setExecutionEnvironment)
+        }
       outcome match {
         case Some(diagnostic: Api.ExecutionResult.Diagnostic) =>
           if (diagnostic.isError) {
@@ -74,7 +78,6 @@ class ExecuteJob(
           )
         )
     } finally {
-      originalExecutionEnvironment.foreach(context.setExecutionEnvironment)
       ctx.locking.releaseReadCompilationLock()
       logger.log(
         Level.FINEST,

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java b/engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java
@@ -4,7 +4,6 @@
 import java.io.PrintStream;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Consumer;
 
 import org.enso.compiler.Compiler;
 import org.enso.compiler.context.InlineContext;