Merge pull request #156 from MartinWeindel/v07-develop

xerial · xerial · commit 3291956b17d9 · 2014-12-29T18:46:21.000+09:00
fixed packExtendedTypeHeader for payload length = 32, 64, 128
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -451,9 +451,12 @@ public MessagePacker packExtendedTypeHeader(int extType, int payloadLen) throws
                     writeByteAndByte(FIXEXT4, (byte) extType);
                 } else if(payloadLen == 8) {
                     writeByteAndByte(FIXEXT8, (byte) extType);
-                } else {
+                } else if(payloadLen == 16) {
                     writeByteAndByte(FIXEXT16, (byte) extType);
-                }
+                } else {
+                    writeByteAndByte(EXT8, (byte) payloadLen);
+                    writeByte((byte) extType);
+                }        	
             } else {
                 writeByteAndByte(EXT8, (byte) payloadLen);
                 writeByte((byte) extType);
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -348,7 +348,7 @@ class MessagePackTest extends MessagePackSpec  {
       }
     }
 
-    val testHeaderLength = Seq(1, 2, 4, 8, 16, 1000, 2000, 10000, 50000, 100000, 500000)
+    val testHeaderLength = Seq(1, 2, 4, 8, 16, 17, 32, 64, 255, 256, 1000, 2000, 10000, 50000, 100000, 500000)
 
 
     "pack/unpack arrays" taggedAs ("array") in {

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ class MessagePackTest extends MessagePackSpec {`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
`351`		`- val testHeaderLength = Seq(1, 2, 4, 8, 16, 1000, 2000, 10000, 50000, 100000, 500000)`
	`351`	`+ val testHeaderLength = Seq(1, 2, 4, 8, 16, 17, 32, 64, 255, 256, 1000, 2000, 10000, 50000, 100000, 500000)`
`352`	`352`
`353`	`353`
`354`	`354`	`"pack/unpack arrays" taggedAs ("array") in {`