simple fix. Socket read return -1 for error.

headius · May 31, 2024 · 5a8ab05 · 5a8ab05
1 parent 0fcbf68
commit 5a8ab05
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java
@@ -238,9 +238,9 @@ private IRubyObject recv(ThreadContext context, IRubyObject length,
                 return null; // not reached
             }
         } else {
-                bytes = doRead(context, buffer);
+            bytes = doRead(context, buffer);
+            if (bytes == null) return context.nil;
         }
-        if (bytes == null) return context.nil;
 
         if (str != null) {
             str.setValue(bytes);
@@ -738,8 +738,7 @@ protected ByteList doRead(ThreadContext context, final ByteBuffer buffer) {
             context.getThread().beforeBlockingCall(context);
 
             int read = openFile.readChannel().read(buffer);
-
-            if (read == 0) return null;
+            if (read <= 0) return null;
 
             return new ByteList(buffer.array(), 0, buffer.position(), false);
         } catch (Exception e) {