Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Small fix to add missing argument to join

git-svn-id: http://svn.codehaus.org/jruby/branches/sandbox@2529 961051c9-f516-0410-bf72-c9f7e237a7b7
  • Loading branch information...
commit c9d598f93fe5181bb20bc2e433c516b69a04161e 1 parent 534e5d6
@olabini olabini authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/org/jruby/RubyThread.java
View
4 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");
}
Please sign in to comment.
Something went wrong with that request. Please try again.