Fix bug MessageUnpacker#prepareNumberBuffer reads updated buffer

komamitsu · komamitsu · commit aa1fa5b7b353 · 2016-02-20T22:12:49.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
@@ -211,15 +211,16 @@ private MessageBuffer prepareNumberBuffer(int readLength)
         else {
             // When the default buffer doesn't contain the whole length
 
-            // 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);
+
+                // TODO loop this method until castBuffer is filled
+                MessageBuffer next = getNextBuffer();
+
                 numberBuffer.putBytes(remaining, next.array(), next.arrayOffset(), readLength - remaining);
 
                 buffer = next;
@@ -229,6 +230,9 @@ private MessageBuffer prepareNumberBuffer(int readLength)
                 return numberBuffer; // Return the numberBuffer
             }
             else {
+                // TODO loop this method until castBuffer is filled
+                MessageBuffer next = getNextBuffer();
+
                 buffer = next;
                 position = readLength;
                 nextReadPosition = 0;
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -17,6 +17,7 @@ package org.msgpack.core
 
 import java.io._
 import java.nio.ByteBuffer
+import java.util.concurrent.{Callable, Executors}
 
 import org.msgpack.core.buffer._
 import org.msgpack.value.ValueType
@@ -687,5 +688,34 @@ class MessageUnpackerTest extends MessagePackSpec {
         Seq(8185, 8186, 8187, 8188, 16377, 16378, 16379, 16380).foreach { n => check(s, n)}
       }
     }
+
+    "unpack" in {
+      val output = new PipedOutputStream
+      val input = new PipedInputStream(output)
+      val executor = Executors.newCachedThreadPool
+
+      val msgpack06 = new org.msgpack.MessagePack
+      val packer06 = msgpack06.createPacker(output)
+      val future = executor.submit(new Callable[Void]
+      {
+        override def call(): Void = {
+          try {
+            for (i <- 0 to 500) {
+              packer06.write(0x0011223344556677L)
+            }
+          }
+          finally {
+            packer06.close
+          }
+          return null
+        }
+      })
+
+      val unpacker = MessagePack.newDefaultUnpacker(input)
+      for (i <- 0 to 500) {
+        unpacker.unpackLong shouldBe 0x0011223344556677L
+      }
+      unpacker.close
+    }
   }
 }
