Restructure and sync logic for propagating Ruby cause to Java.

jruby · Sep 5, 2017 · 1f2e040 · 1f2e040
1 parent 22c9c83
commit 1f2e040
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -914,11 +914,15 @@ private static void maybeRaiseJavaException(final Ruby runtime,
 
             if (maybeThrowable instanceof Throwable) {
                 final Throwable ex = (Throwable) maybeThrowable;
-                if (ex.getCause() == null && cause instanceof ConcreteJavaProxy) {
-                    // allow raise java.lang.RuntimeException.new, cause: myCurrentException()
+                if (cause instanceof ConcreteJavaProxy) {
                     maybeThrowable = ((ConcreteJavaProxy) cause).getObject();
-                    if (maybeThrowable instanceof Throwable && ex != maybeThrowable && ex.getCause() == null) {
-                        ex.initCause((Throwable) maybeThrowable);
+                    if (maybeThrowable instanceof Throwable && ex != maybeThrowable) {
+                        // we have a Throwable we can set for cause, do it under lock
+                        synchronized (ex) {
+                            if (ex.getCause() == null) {
+                                ex.initCause((Throwable) maybeThrowable);
+                            }
+                        }
                     }
                 }
                 Helpers.throwException(ex); return; // not reached