Merge branch 'develop' of https://github.com/msgpack/msgpack-java into develop

marenzo · marenzo · commit cd938e142886 · 2016-04-07T19:48:20.000+03:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java
@@ -255,9 +255,9 @@ public PackerConfig()
 
         private PackerConfig(PackerConfig copy)
         {
-            this.smallStringOptimizationThreshold = smallStringOptimizationThreshold;
-            this.bufferFlushThreshold = bufferFlushThreshold;
-            this.bufferSize = bufferSize;
+            this.smallStringOptimizationThreshold = copy.smallStringOptimizationThreshold;
+            this.bufferFlushThreshold = copy.bufferFlushThreshold;
+            this.bufferSize = copy.bufferSize;
         }
 
         @Override
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -48,6 +48,28 @@ class MessagePackTest extends MessagePackSpec {
   }
 
   "MessagePack" should {
+
+    "clone packer config" in {
+      val config = new PackerConfig().withBufferSize(10).withBufferFlushThreshold(32 * 1024).withSmallStringOptimizationThreshold(142)
+      val copy = config.clone()
+
+      copy shouldBe config
+    }
+
+    "clone unpacker config" in {
+      val config = new UnpackerConfig()
+              .withBufferSize(1)
+              .withActionOnMalformedString(CodingErrorAction.IGNORE)
+              .withActionOnUnmappableString(CodingErrorAction.REPORT)
+              .withAllowReadingBinaryAsString(false)
+              .withStringDecoderBufferSize(34)
+              .withStringSizeLimit(4324)
+
+      val copy = config.clone()
+      copy shouldBe config
+    }
+
+
     "detect fixint values" in {
 
       for (i <- 0 until 0x79) {

Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,9 @@ public PackerConfig()`
`255`	`255`
`256`	`256`	`private PackerConfig(PackerConfig copy)`
`257`	`257`	`{`
`258`		`- this.smallStringOptimizationThreshold = smallStringOptimizationThreshold;`
`259`		`- this.bufferFlushThreshold = bufferFlushThreshold;`
`260`		`- this.bufferSize = bufferSize;`
	`258`	`+ this.smallStringOptimizationThreshold = copy.smallStringOptimizationThreshold;`
	`259`	`+ this.bufferFlushThreshold = copy.bufferFlushThreshold;`
	`260`	`+ this.bufferSize = copy.bufferSize;`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`@Override`