Ensure evaluation session is cleared on exit

2016-01-05 12:44:00 +01:00 · 2016-01-05 12:44:00 +01:00 · 2dfe0db180
parent 406c8c3af1
commit 2dfe0db180
1 changed files with 6 additions and 1 deletions
--- a/reactor/Core/src/jetbrains/mps/logic/reactor/core/MemEvaluationSession.kt
+++ b/reactor/Core/src/jetbrains/mps/logic/reactor/core/MemEvaluationSession.kt
@ -51,7 +51,12 @@ class MemEvaluationSession : EvaluationSession {
            session = MemEvaluationSession(program)
            ourBackend.ourSession.set(session)

-            session.launch(myParameters["main"] as ConstraintOccurrence)
+            try {
+                session.launch(myParameters["main"] as ConstraintOccurrence)
+            }
+            finally {
+                ourBackend.ourSession.set(null)
+            }

            return session
        }