Fixes #3338. JRuby 9.0.1.0 #to_ary should return Array

jruby · Oct 8, 2015 · 55e2030 · 55e2030
1 parent 5f11f7e
commit 55e2030
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -481,10 +481,14 @@ public static IRubyObject[] convertValueIntoArgArray(ThreadContext context, IRub
                     return (value instanceof RubyArray) ? ((RubyArray)value).toJavaArray() : new IRubyObject[] { value };
                 } else {
                     IRubyObject val0 = Helpers.aryToAry(value);
-                    if (!(val0 instanceof RubyArray)) {
+                    // FIXME: This logic exists in RubyProc and IRRubyBlockBody. consolidate when we do block call protocol work
+                    if (val0.isNil()) {
+                        return new IRubyObject[] { value };
+                    } else if (!(val0 instanceof RubyArray)) {
                         throw context.runtime.newTypeError(value.getType().getName() + "#to_ary should return Array");
+                    } else {
+                        return ((RubyArray) val0).toJavaArray();
                     }
-                    return ((RubyArray)val0).toJavaArray();
                 }
         }
     }