Fix JRUBY-6907

headius · headius · commit 0b0f2b34c5db · 2012-10-09T16:49:27.000-10:00
Regression: ruby,java(thread),ruby exception path results in nilClass exception

This is another case where removal of the $! setting we did before
running exception-handling blocks appeared to be premature or
incorrect. There appears to be some paths through exception
handling -- perhaps only in the interpreter -- that fail to set
$! properly beforehand. I have restored one of these sets, and the
case given in the bug report now passes.

We should get these cases rolled in; would appreciate if you can
adapt them to our JI specs and send us a PR.
diff --git a/src/org/jruby/ast/RescueNode.java b/src/org/jruby/ast/RescueNode.java
@@ -176,6 +176,8 @@ private IRubyObject handleException(Ruby runtime, ThreadContext context, IRubyOb
             IRubyObject[] exceptions = getExceptions(cRescueNode, runtime, context, self, aBlock);
 
             if (RuntimeHelpers.isExceptionHandled(raisedException, exceptions, context).isTrue()) {
+                runtime.getGlobalVariables().set("$!", raisedException);
+
                 return cRescueNode.interpret(runtime,context, self, aBlock);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,8 @@ private IRubyObject handleException(Ruby runtime, ThreadContext context, IRubyOb`
`176`	`176`	`IRubyObject[] exceptions = getExceptions(cRescueNode, runtime, context, self, aBlock);`
`177`	`177`
`178`	`178`	`if (RuntimeHelpers.isExceptionHandled(raisedException, exceptions, context).isTrue()) {`
	`179`	`+ runtime.getGlobalVariables().set("$!", raisedException);`
	`180`	`+`
`179`	`181`	`return cRescueNode.interpret(runtime,context, self, aBlock);`
`180`	`182`	`}`
`181`	`183`