Skip to content

Commit

Permalink
Merge branch 'master' into ruby-2.3+socket
Browse files Browse the repository at this point in the history
headius committed May 9, 2016
2 parents 4bb3dc9 + 015d17c commit 0ebbb54
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions core/src/main/java/org/jruby/ext/socket/RubySocket.java
Original file line number Diff line number Diff line change
@@ -211,18 +211,14 @@ public IRubyObject connect_nonblock(ThreadContext context, IRubyObject arg, IRub

boolean exception = ArgsUtil.extractKeywordArg(context, "exception", opts) != runtime.getFalse();

doConnectNonblock(context, addr, exception);

return RubyFixnum.zero(context.runtime);
return doConnectNonblock(context, addr, exception);
}

@JRubyMethod()
public IRubyObject connect(ThreadContext context, IRubyObject arg) {
SocketAddress addr = addressForChannel(context, arg);

doConnect(context, addr, true);

return RubyFixnum.zero(context.runtime);
return doConnect(context, addr, true);
}

@JRubyMethod()

0 comments on commit 0ebbb54

Please sign in to comment.