Fix for JRUBY-3491: NullPointerException when calling #arity on Klass…

….method(:new)

git-svn-id: http://svn.codehaus.org/jruby/branches/jruby-1_2@9404 961051c9-f516-0410-bf72-c9f7e237a7b7

src/org/jruby/RubyClass.java

@@ -532,7 +532,6 @@ public IRubyObject newInstance(ThreadContext context, IRubyObject[] args, Block
         return obj;
     }
 
-    // TODO: replace this with a smarter generated invoker that can handle 0-N args
     public static class SpecificArityNew extends JavaMethod {
         public SpecificArityNew(RubyModule implClass, Visibility visibility) {
             super(implClass, visibility);

src/org/jruby/internal/runtime/methods/JavaMethod.java

@@ -39,7 +39,7 @@
  */
 public abstract class JavaMethod extends DynamicMethod implements JumpTarget, Cloneable {
     protected int arityValue;
-    protected Arity arity;
+    protected Arity arity = Arity.OPTIONAL;
     private String javaName;
     private boolean isSingleton;
     protected StaticScope staticScope;

test/jruby_index

@@ -40,6 +40,7 @@ test_included_in_object_space
 test_io
 test_load
 test_math
+test_method
 test_method_cache
 test_method_override_and_caching
 test_nkf

test/test_method.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+
+class TestMethod < Test::Unit::TestCase
+  # JRUBY-3491: NullPointerException when calling #arity on Klass.method(:new)
+  def test_jruby_3491
+    assert_nothing_raised do
+      String.method(:new).arity
+    end
+  end
+end