Merge pull request #3929 from headius/waitreadable_blocking

waitReadable should block
jruby · May 26, 2016 · a65ad3a · a65ad3a
2 parents 276a7d2 + f4d66bd
commit a65ad3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -2853,9 +2853,10 @@ IRubyObject getPartial(ThreadContext context, IRubyObject[] args, boolean nonblo
                     //                n = arg.len;
                     n = OpenFile.readInternal(context, fptr, fptr.fd(), strByteList.unsafeBytes(), strByteList.begin(), len);
                     if (n < 0) {
+                        Errno e = fptr.errno();
                         if (!nonblock && fptr.waitReadable(context))
                             continue again;
-                        if (nonblock && (fptr.errno() == Errno.EWOULDBLOCK || fptr.errno() == Errno.EAGAIN)) {
+                        if (nonblock && (e == Errno.EWOULDBLOCK || e == Errno.EAGAIN)) {
                             if (noException) return runtime.newSymbol("wait_readable");
                             throw runtime.newErrnoEAGAINReadableError("read would block");
                         }

diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -492,7 +492,7 @@ public boolean waitReadable(ThreadContext context, long timeout) {
 
     // rb_io_wait_readable
     public boolean waitReadable(ThreadContext context) {
-        return waitReadable(context, 0);
+        return waitReadable(context, -1);
     }
 
     /**