Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0e48f7b42396
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8622c166ac53
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 29, 2016

  1. Copy the full SHA
    acd4025 View commit details
  2. Copy the full SHA
    867a9c1 View commit details

Commits on Sep 30, 2016

  1. Merge pull request #4190 from etehtsea/tcpserver-acceptnonblock

    TCPServer#accept_nonblock improvement
    headius authored Sep 30, 2016
    Copy the full SHA
    8622c16 View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −1 core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
  2. +0 −3 spec/tags/ruby/library/socket/tcpserver/accept_nonblock_tags.txt
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
Original file line number Diff line number Diff line change
@@ -214,7 +214,7 @@ public IRubyObject accept_nonblock(ThreadContext context, Ruby runtime, boolean

if (!ready) {
// no connection immediately accepted, let them try again
throw runtime.newErrnoEAGAINError("Resource temporarily unavailable");
throw runtime.newErrnoEAGAINReadableError("Resource temporarily unavailable");

} else {
// otherwise one key has been selected (ours) so we get the channel and hand it off

This file was deleted.