Fix altered behavior for UNIXServer#accept_nonblock.

This broke due to fixing jnr-unixsocket to return null on failed nonblocking accept.
jruby · Sep 29, 2016 · cc79119 · cc79119
1 parent d9090c3
commit cc79119
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyUNIXServer.java b/core/src/main/java/org/jruby/ext/socket/RubyUNIXServer.java
@@ -129,6 +129,8 @@ public IRubyObject accept_nonblock(ThreadContext context, Ruby runtime, boolean
                 try {
                     UnixSocketChannel socketChannel = ((UnixServerSocketChannel) selectable).accept();
 
+                    if (socketChannel == null) throw runtime.newErrnoEAGAINReadableError("accept(2) would block");
+
                     RubyUNIXSocket sock = (RubyUNIXSocket)(Helpers.invoke(context, runtime.getClass("UNIXSocket"), "allocate"));
 
                     sock.init_sock(context.runtime, socketChannel, "");