jruby · Aug 30, 2017 · Aug 30, 2017
Showing with 21 additions and 2 deletions.

+1 −1 core/src/main/java/org/jruby/RubyKernel.java

+20 −1 core/src/main/java/org/jruby/ast/ListNode.java
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -917,7 +917,7 @@ private static void maybeRaiseJavaException(final Ruby runtime,
                 if (ex.getCause() == null && cause instanceof ConcreteJavaProxy) {
                     // allow raise java.lang.RuntimeException.new, cause: myCurrentException()
                     maybeThrowable = ((ConcreteJavaProxy) cause).getObject();
-                    if (maybeThrowable instanceof Throwable && ex != maybeThrowable) {
+                    if (maybeThrowable instanceof Throwable && ex != maybeThrowable && ex.getCause() == null) {
                         ex.initCause((Throwable) maybeThrowable);
                     }
                 }

diff --git a/core/src/main/java/org/jruby/ast/ListNode.java b/core/src/main/java/org/jruby/ast/ListNode.java
@@ -30,6 +30,7 @@
 package org.jruby.ast;
 
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
@@ -40,7 +41,7 @@
  * In particular, f_arg production rule uses this to capture arg information for
  * the editor projects who want position info saved.
  */
-public class ListNode extends Node {
+public class ListNode extends Node implements Iterable<Node> {
     private static final Node[] EMPTY = new Node[0];
     private static final int INITIAL_SIZE = 4;
     private Node[] list;
@@ -174,4 +175,22 @@ public <T> T accept(NodeVisitor<T> visitor) {
     public Node get(int idx) {
         return list[idx];
     }
+
+    @Override
+    public Iterator<Node> iterator() {
+        return new Iterator<Node>() {
+            int i = 0;
+
+            @Override
+            public boolean hasNext() {
+                return i < list.length;
+            }
+
+            @Override
+            public Node next() {
+                if (i >= list.length) throw new IndexOutOfBoundsException(i);
+                return list[i++];
+            }
+        };
+    }
 }