Small fix to add missing argument to join

git-svn-id: http://svn.codehaus.org/jruby/branches/sandbox@2529 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · Dec 2, 2006 · c9d598f · c9d598f
1 parent 534e5d6
commit c9d598f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/org/jruby/RubyThread.java b/src/org/jruby/RubyThread.java
@@ -90,7 +90,7 @@ public static RubyClass createThreadClass(IRuby runtime) {
         threadClass.defineMethod("group", 
                 callbackFactory.getMethod("group"));
         threadClass.defineMethod("join", 
-                callbackFactory.getMethod("join"));
+                callbackFactory.getOptMethod("join"));
         threadClass.defineMethod("key?", 
                 callbackFactory.getMethod("has_key", IRubyObject.class));
         threadClass.defineMethod("priority", 
@@ -383,7 +383,7 @@ public RubyBoolean is_alive() {
         return threadImpl.isAlive() ? getRuntime().getTrue() : getRuntime().getFalse();
     }
 
-    public RubyThread join() {
+    public RubyThread join(IRubyObject[] args) {
         if (isCurrent()) {
             throw getRuntime().newThreadError("thread tried to join itself");
         }