Fixes msgpack#232

xerial · xerial · commit 545d0de44291 · 2015-05-25T15:32:38.000+09:00
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
@@ -419,10 +419,12 @@ public void putByteBuffer(int index, ByteBuffer src, int len) {
 
         if(src.isDirect()) {
             unsafe.copyMemory(null, DirectBufferAccess.getAddress(src) + src.position(), base, address + index, len);
+            src.position(src.position() + len);
         }
         else if(src.hasArray()) {
             byte[] srcArray = src.array();
             unsafe.copyMemory(srcArray, ARRAY_BYTE_BASE_OFFSET + src.position(), base, address + index, len);
+            src.position(src.position() + len);
         }
         else {
             if(base != null) {
@@ -434,7 +436,6 @@ else if(src.hasArray()) {
                 }
             }
         }
-        src.position(src.position() + len);
     }
 
     /**
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -16,6 +16,7 @@
 package org.msgpack.core
 
 import java.io.{FileInputStream, FileOutputStream, File, ByteArrayOutputStream}
+import java.nio.ByteBuffer
 
 import org.msgpack.core.buffer.{ChannelBufferOutput, MessageBufferOutput, OutputStreamBufferOutput}
 import xerial.core.io.IOUtil
@@ -217,4 +218,14 @@ class MessagePackerTest extends MessagePackSpec {
 
     out.toByteArray.length shouldBe packerTotalWrittenBytes
   }
+
+  "support read-only buffer" taggedAs("read-only") in {
+    val payload = Array[Byte](1)
+    val buffer = ByteBuffer.wrap(payload).asReadOnlyBuffer()
+    val out = new ByteArrayOutputStream()
+    val packer = MessagePack.newDefaultPacker(out)
+      .packBinaryHeader(1)
+      .writePayload(buffer)
+      .close()
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -419,10 +419,12 @@ public void putByteBuffer(int index, ByteBuffer src, int len) {`
`419`	`419`
`420`	`420`	`if(src.isDirect()) {`
`421`	`421`	`unsafe.copyMemory(null, DirectBufferAccess.getAddress(src) + src.position(), base, address + index, len);`
	`422`	`+ src.position(src.position() + len);`
`422`	`423`	`}`
`423`	`424`	`else if(src.hasArray()) {`
`424`	`425`	`byte[] srcArray = src.array();`
`425`	`426`	`unsafe.copyMemory(srcArray, ARRAY_BYTE_BASE_OFFSET + src.position(), base, address + index, len);`
	`427`	`+ src.position(src.position() + len);`
`426`	`428`	`}`
`427`	`429`	`else {`
`428`	`430`	`if(base != null) {`
`@@ -434,7 +436,6 @@ else if(src.hasArray()) {`
`434`	`436`	`}`
`435`	`437`	`}`
`436`	`438`	`}`
`437`		`- src.position(src.position() + len);`
`438`	`439`	`}`
`439`	`440`
`440`	`441`	`/**`