Fix regression in Thread#cause propagation tweak.

jruby · Jun 26, 2017 · 8d3b9aa · 8d3b9aa
1 parent adaea9b
commit 8d3b9aa
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -258,7 +258,14 @@ private void executeInterrupts(ThreadContext context, boolean blockingTiming) {
                     if (status.get() == Status.SLEEP) {
                         exitSleep();
                     }
-                    RubyKernel.raise(context, runtime.getKernel(), new IRubyObject[]{err, RubyHash.newKwargs(runtime, "cause", ((RubyException) err).cause)}, Block.NULL_BLOCK);
+                    // if it's a Ruby exception, force the cause through
+                    IRubyObject[] args;
+                    if (err instanceof RubyException) {
+                        args = Helpers.arrayOf(err, RubyHash.newKwargs(runtime, "cause", ((RubyException) err).cause));
+                    } else {
+                        args = Helpers.arrayOf(err);
+                    }
+                    RubyKernel.raise(context, runtime.getKernel(), args, Block.NULL_BLOCK);
                 }
             }