msgpack#103: Simplified ArrayBufferInput

xerial · xerial · commit 952996e3b0a8 · 2014-05-30T17:02:45.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java
@@ -9,34 +9,26 @@
 public class ArrayBufferInput implements MessageBufferInput {
 
     private MessageBuffer buffer;
-    private int cursor;
+    private boolean isRead = false;
     private final int length;
 
     public ArrayBufferInput(byte[] arr) {
         this(arr, 0, arr.length);
     }
 
     public ArrayBufferInput(byte[] arr, int offset, int length) {
-        this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null"));
-        this.cursor = offset;
+        this.buffer = MessageBuffer.wrap(checkNotNull(arr, "input array is null")).slice(offset, length);
         checkArgument(length <= arr.length);
         this.length = length;
     }
 
 
     @Override
     public MessageBuffer next() throws IOException {
-        if(cursor < length) {
-            int c = cursor;
-            cursor = length;
-            if(c == 0 && length == buffer.size)
-                return buffer;
-            else
-                return buffer.slice(c, length);
-        }
-        else {
+        if(isRead)
             return null;
-        }
+        isRead = true;
+        return buffer;
     }
 
     @Override
