Merge branch 'v07-develop' into v07-value

xerial · xerial · commit 08197e3afc57 · 2014-12-08T16:30:42.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -511,8 +511,10 @@ public MessagePacker writePayload(ByteBuffer src) throws IOException {
         else {
             // If the input source is small, simply copy the contents to the buffer
             while(src.remaining() > 0) {
-                if(position >= buffer.size())
+                if(position >= buffer.size()) {
                     flush();
+                }
+                prepareBuffer();
                 int writeLen = Math.min(buffer.size() - position, src.remaining());
                 buffer.putByteBuffer(position, src, writeLen);
                 position += writeLen;
diff --git a/msgpack-core/src/main/java/org/msgpack/value/holder/FloatHolder.java b/msgpack-core/src/main/java/org/msgpack/value/holder/FloatHolder.java
@@ -170,7 +170,7 @@ public String toString() {
             case DOUBLE:
                 return Double.toString(value);
             default:
-                throw new IllegalStateException("cannto reach here");
+                throw new IllegalStateException("cannot reach here");
         }
     }
 
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -21,6 +21,7 @@ import org.msgpack.core.buffer.{OutputStreamBufferOutput, ArrayBufferInput}
 import xerial.core.io.IOUtil
 
 import scala.util.Random
+import org.msgpack.value.ValueFactory
 
 /**
  *
@@ -102,5 +103,32 @@ class MessagePackerTest extends MessagePackSpec {
 
     }
 
+    "pack larger string array than byte buf" taggedAs ("larger-string-array-than-byte-buf") in {
+      // Based on https://github.com/msgpack/msgpack-java/issues/154
+
+      // TODO: Refactor this test code to fit other ones.
+      def test(bufferSize: Int, stringSize: Int): Boolean = {
+        val msgpack = new MessagePack(new MessagePack.ConfigBuilder().packerBufferSize(bufferSize).build)
+        val str = "a" * stringSize
+        val rawString = ValueFactory.newRawString(str.getBytes("UTF-8"))
+        val array = ValueFactory.newArray(rawString)
+        val out = new ByteArrayOutputStream()
+        val packer = msgpack.newPacker(out)
+        packer.packValue(array)
+        packer.close()
+        out.toByteArray
+        true
+      }
+
+      val testCases = List(
+        32 -> 30,
+        33 -> 31,
+        32 -> 31,
+        34 -> 32
+      )
+      testCases.foreach{
+        case (bufferSize, stringSize) => test(bufferSize, stringSize)
+      }
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public String toString() {`
`170`	`170`	`case DOUBLE:`
`171`	`171`	`return Double.toString(value);`
`172`	`172`	`default:`
`173`		`- throw new IllegalStateException("cannto reach here");`
	`173`	`+ throw new IllegalStateException("cannot reach here");`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`