1.8 does not have this read(0) short-circuit.

jruby · Dec 24, 2014 · 5c47af7 · 5c47af7
1 parent b13ef5c
commit 5c47af7
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -3136,7 +3136,7 @@ private IRubyObject readNotAll(ThreadContext context, OpenFile myOpenFile, int l
         Ruby runtime = context.runtime;
         str.empty();
 
-        if (length == 0) return str;
+        if (runtime.is1_9() && length == 0) return str;
 
         try {
             ByteList newBuffer = readNotAllCommon(context, myOpenFile, length);
@@ -3163,7 +3163,7 @@ private IRubyObject readNotAll(ThreadContext context, OpenFile myOpenFile, int l
     private IRubyObject readNotAll(ThreadContext context, OpenFile myOpenFile, int length) {
         Ruby runtime = context.runtime;
 
-        if (length == 0) return RubyString.newEmptyString(runtime);
+        if (runtime.is1_9() && length == 0) return RubyString.newEmptyString(runtime);
 
         try {
             ByteList newBuffer = readNotAllCommon(context, myOpenFile, length);

diff --git a/test/test_socket.rb b/test/test_socket.rb
@@ -530,6 +530,6 @@ def test_read_zero_never_blocks
   ensure
     server.close rescue nil
     client.close rescue nil
-  end
+  end if RUBY_VERSION >= '1.9'
 end