optimized slightly MessageUnpacker.readCastBuffer

frsyuki · komamitsu · commit 9eff0cac5a20 · 2015-12-27T17:48:22.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -253,18 +253,26 @@ private MessageBuffer readCastBuffer(int length)
                 throw new MessageInsufficientBufferException();
             }
 
-            // TODO this doesn't work if MessageBuffer is allocated by newDirectBuffer.
-            //      add copy method to MessageBuffer to solve this issue.
-            castBuffer.putBytes(0, buffer.array(), buffer.arrayOffset() + position, remaining);
-            castBuffer.putBytes(remaining, next.array(), next.arrayOffset(), length - remaining);
-
             totalReadBytes += buffer.size();
 
-            buffer = next;
-            position = length - remaining;
-            readCastBufferPosition = 0;
+            if (remaining > 0) {
+                // TODO this doesn't work if MessageBuffer is allocated by newDirectBuffer.
+                //      add copy method to MessageBuffer to solve this issue.
+                castBuffer.putBytes(0, buffer.array(), buffer.arrayOffset() + position, remaining);
+                castBuffer.putBytes(remaining, next.array(), next.arrayOffset(), length - remaining);
+
+                buffer = next;
+                position = length - remaining;
+                readCastBufferPosition = 0;
 
-            return castBuffer;
+                return castBuffer;
+            }
+            else {
+                buffer = next;
+                position = length;
+                readCastBufferPosition = 0;
+                return buffer;
+            }
         }
     }
 
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
@@ -76,7 +76,7 @@ public MessageBuffer next()
         if (readLen == -1) {
             return null;
         }
-        return MessageBuffer.wrap(buffer).slice(0, readLen);
+        return MessageBuffer.wrap(buffer, 0, readLen);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public MessageBuffer next()`
`76`	`76`	`if (readLen == -1) {`
`77`	`77`	`return null;`
`78`	`78`	`}`
`79`		`- return MessageBuffer.wrap(buffer).slice(0, readLen);`
	`79`	`+ return MessageBuffer.wrap(buffer, 0, readLen);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`