Use partial read results to avoid I/O block when reading at the end of a stream

xerial · xerial · commit af428dee61c3 · 2015-05-26T01:06:32.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java
@@ -54,24 +54,13 @@ public MessageBuffer next() throws IOException {
         if(reachedEOF)
             return null;
 
-        byte[] buffer = null;
-        int cursor = 0;
-        while(!reachedEOF && cursor < bufferSize) {
-            if(buffer == null) {
-                buffer = new byte[bufferSize];
-            }
-
-            int readLen = -1;
-            // available() == 0 means, it reached the end of the stream
-            if(in.available() == 0 ||
-                (readLen = in.read(buffer, cursor, bufferSize - cursor)) == -1) {
-                reachedEOF = true;
-                break;
-            }
-            cursor += readLen;
+        byte[] buffer = new byte[bufferSize];
+        int readLen = in.read(buffer);
+        if(readLen == -1) {
+            reachedEOF = true;
+            return null;
         }
-
-        return buffer == null ? null : MessageBuffer.wrap(buffer).slice(0, cursor);
+        return MessageBuffer.wrap(buffer).slice(0, readLen);
     }
 
     @Override
