END should fire even if Ruby has exception in eval

jruby · Oct 22, 2014 · 736fb94 · 736fb94
1 parent 0b95ac1
commit 736fb94
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/interpreter/Interpreter.java b/core/src/main/java/org/jruby/ir/interpreter/Interpreter.java
@@ -102,8 +102,8 @@ public static IRubyObject interpretCommonEval(Ruby runtime, String file, int lin
 
             runBeginEndBlocks(evalScript.getBeginBlocks(), context, self, ss, null); // FIXME: No temp vars yet right?
             rv = evalScript.call(context, self, evalScript.getStaticScope().getModule(), s, block, backtraceName);
-            runBeginEndBlocks(evalScript.getEndBlocks(), context, self, ss, null); // FIXME: No temp vars right?
         } finally {
+            runBeginEndBlocks(evalScript.getEndBlocks(), context, self, ss, null); // FIXME: No temp vars right?
             s.clearEvalType();
             context.popScope();
         }