Merge pull request msgpack#348 from naritta/MikePlayle-develop-add-test

Merge "Copy old data before fetching new data, to avoid overwriting it" and add test for that

Author: xerial

msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java

@@ -208,32 +208,36 @@ private MessageBuffer prepareNumberBuffer(int readLength)
  position += readLength; // here assumes following buffer.getXxx never throws exception
  return buffer; // Return the default buffer
  }
+ else if(remaining == 0) {
+ buffer = getNextBuffer();
+ position = readLength;
+ nextReadPosition = 0;
+ return buffer;
+ }
  else {
  // When the default buffer doesn't contain the whole length
 
+ // TODO This doesn't work if MessageBuffer is allocated by newDirectBuffer.
+ // Add copy method to MessageBuffer to solve this issue.
+
+ // Copy the data fragment from the current buffer
+
+ numberBuffer.putBytes(0,
+ buffer.array(), buffer.arrayOffset() + position,
+ remaining);
+
  // TODO loop this method until castBuffer is filled
  MessageBuffer next = getNextBuffer();
 
- if (remaining > 0) {
- // TODO This doesn't work if MessageBuffer is allocated by newDirectBuffer.
- // Add copy method to MessageBuffer to solve this issue.
-
- // Copy the data fragment from the current buffer
- numberBuffer.putBytes(0, buffer.array(), buffer.arrayOffset() + position, remaining);
- numberBuffer.putBytes(remaining, next.array(), next.arrayOffset(), readLength - remaining);
+ numberBuffer.putBytes(remaining,
+ next.array(), next.arrayOffset(),
+ readLength - remaining);
 
-  buffer = next;
-  position = readLength - remaining;
-  nextReadPosition = 0;
+ buffer = next;
+ position = readLength - remaining;
+ nextReadPosition = 0;
 
- return numberBuffer; // Return the numberBuffer
- }
- else {
- buffer = next;
- position = readLength;
- nextReadPosition = 0;
- return buffer;
- }
+ return numberBuffer; // Return the numberBuffer
  }
  }
 

msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala

@@ -147,7 +147,7 @@ class MessageUnpackerTest extends MessagePackSpec {
  val mapLen = unpacker.unpackMapHeader()
  debug(s"map size: $mapLen")
  case ValueType.INTEGER =>
- val i = unpacker.unpackInt()
+ val i = unpacker.unpackLong()
  debug(s"int value: $i")
  case ValueType.STRING =>
  val s = unpacker.unpackString()
@@ -296,7 +296,23 @@ class MessageUnpackerTest extends MessagePackSpec {
 
  new SplitTest {val data = testData}.run
  new SplitTest {val data = testData3(30)}.run
+ }
+
+ "read numeric data at buffer boundary" taggedAs("boundary2") in {
+ val packer = MessagePack.newDefaultBufferPacker()
+ (0 until 1170).foreach{i =>
+ packer.packLong(0x0011223344556677L)
+ packer.packString("hello")
+ }
+ packer.close
+ val data = packer.toByteArray
 
+ val unpacker = MessagePack.newDefaultUnpacker(new InputStreamBufferInput(new ByteArrayInputStream(data), 8192))
+ (0 until 1170).foreach { i =>
+ unpacker.unpackLong() shouldBe 0x0011223344556677L
+ unpacker.unpackString() shouldBe "hello"
+ }
+ unpacker.close()
  }
 
  "be faster then msgpack-v6 skip" taggedAs ("cmp-skip") in {