Use ChannelBufferInput when FileInputStream is passed to the unpacker

xerial · xerial · commit b71b05a41ed4 · 2014-05-30T14:32:52.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java
@@ -4,30 +4,53 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 
-import static org.msgpack.core.Preconditions.checkNotNull;
+import static org.msgpack.core.Preconditions.*;
 
 /**
  * {@link MessageBufferInput} adapter for {@link java.nio.channels.ReadableByteChannel}
  */
 public class ChannelBufferInput implements MessageBufferInput {
 
     private final ReadableByteChannel channel;
+    private boolean reachedEOF = false;
+    private final int bufferSize;
 
     public ChannelBufferInput(ReadableByteChannel channel) {
+        this(channel, 8192);
+    }
+
+    public ChannelBufferInput(ReadableByteChannel channel, int bufferSize) {
         this.channel = checkNotNull(channel, "input channel is null");
+        checkArgument(bufferSize > 0, "buffer size must be > 0: " + bufferSize);
+        this.bufferSize = bufferSize;
     }
 
     @Override
     public MessageBuffer next() throws IOException {
-        MessageBuffer m = MessageBuffer.newBuffer(8192);
+
+        if(reachedEOF)
+            return null;
+
+        MessageBuffer m = MessageBuffer.newBuffer(bufferSize);
         ByteBuffer b = m.toByteBuffer(0, m.size);
-        for(int ret = 0; (ret = channel.read(b)) != -1; ) {
+        while(b.remaining() > 0) {
+            int ret = 0;
+            ret = channel.read(b);
+            if(ret == -1) {
+                reachedEOF = true;
+                break;
+            }
         }
         b.flip();
-        if(b.remaining() < m.size)
-            return m.slice(0, b.remaining());
-        else
+        if(b.remaining() == 0) {
+            return null;
+        }
+        else if(b.limit() < m.size) {
+            return m.slice(0, b.limit());
+        }
+        else {
             return m;
+        }
     }
 
     @Override
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
@@ -1,6 +1,7 @@
 package org.msgpack.core.buffer;
 
 import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
@@ -50,6 +51,8 @@ public static MessageBufferInput newBufferInput(InputStream in) {
             catch(Exception e) {
                 // Failed to retrieve the raw byte array
             }
+        } else if (in instanceof FileInputStream) {
+            return new ChannelBufferInput(((FileInputStream) in).getChannel());
         }
 
         return new InputStreamBufferInput(in);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package org.msgpack.core.buffer;`
`2`	`2`
`3`	`3`	`import java.io.ByteArrayInputStream;`
	`4`	`+import java.io.FileInputStream;`
`4`	`5`	`import java.io.IOException;`
`5`	`6`	`import java.io.InputStream;`
`6`	`7`	`import java.lang.reflect.Field;`
`@@ -50,6 +51,8 @@ public static MessageBufferInput newBufferInput(InputStream in) {`
`50`	`51`	`catch(Exception e) {`
`51`	`52`	`// Failed to retrieve the raw byte array`
`52`	`53`	`}`
	`54`	`+ } else if (in instanceof FileInputStream) {`
	`55`	`+ return new ChannelBufferInput(((FileInputStream) in).getChannel());`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`return new InputStreamBufferInput(in);`