Merge pull request msgpack#191 from xerial/v07-develop

komamitsu · komamitsu · commit 35db8d6b70f7 · 2015-02-02T15:49:00.000+09:00
msgpack#188: Fix MessageBuffer.wrap(ByteBuffer) to consider position() and remaining()
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -506,7 +506,7 @@ public MessagePacker writePayload(ByteBuffer src) throws IOException {
             flush();
 
             // Wrap the input source as a MessageBuffer
-            MessageBuffer wrapped = MessageBuffer.wrap(src).slice(src.position(), src.remaining());
+            MessageBuffer wrapped = MessageBuffer.wrap(src);
             // Then, dump the source data to the output
             out.flush(wrapped);
             src.position(src.limit());
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java
@@ -280,7 +280,7 @@ public static MessageBuffer wrap(byte[] array) {
     }
 
     public static MessageBuffer wrap(ByteBuffer bb) {
-        return newMessageBuffer(bb);
+        return newMessageBuffer(bb).slice(bb.position(), bb.remaining());
     }
 
     /**
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/buffer/MessageBufferTest.scala
@@ -11,6 +11,14 @@ class MessageBufferTest extends MessagePackSpec {
 
   "MessageBuffer" should {
 
+    "wrap ByteBuffer considering position and remaining values" taggedAs("wrap-bb") in {
+      val d = Array[Byte](10,11,12,13,14,15,16,17,18,19)
+      val subset = ByteBuffer.wrap(d, 2, 2)
+      val mb = MessageBuffer.wrap(subset)
+      mb.getByte(0) shouldBe 12
+      mb.size() shouldBe 2
+    }
+
     "have better performance than ByteBuffer" in {
 
       val N = 1000000

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ public static MessageBuffer wrap(byte[] array) {`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`public static MessageBuffer wrap(ByteBuffer bb) {`
`283`		`- return newMessageBuffer(bb);`
	`283`	`+ return newMessageBuffer(bb).slice(bb.position(), bb.remaining());`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`/**`