Merge remote-tracking branch 'origin/jruby-1_7'

jruby · Aug 19, 2015 · caa5904 · caa5904
2 parents d2f080e + 6992f8e
commit caa5904
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -56,6 +56,7 @@
 import org.jruby.internal.runtime.RubyRunnable;
 import org.jruby.internal.runtime.ThreadLike;
 import org.jruby.internal.runtime.ThreadService;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -1492,7 +1493,7 @@ public void exceptionRaised(Throwable exception) {
         Ruby runtime = getRuntime();
         if (abortOnException(runtime) && exception instanceof Error) {
             // re-propagate on main thread
-            runtime.getThreadService().getMainThread().getNativeThread().stop(exception);
+            runtime.getThreadService().getMainThread().raise(JavaUtil.convertJavaToUsableRubyObject(runtime, exception));
         } else {
             // just rethrow on this thread, let system handlers report it
             Helpers.throwException(exception);