Use REPLACE mode when converting java string into UTF8.

xerial · xerial · commit b23c658a1878 · 2016-04-27T12:58:34.000-07: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
@@ -27,6 +27,7 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
 
 import static org.msgpack.core.MessagePack.Code.ARRAY16;
 import static org.msgpack.core.MessagePack.Code.ARRAY32;
@@ -447,7 +448,9 @@ private void packStringWithGetBytes(String s)
     private void prepareEncoder()
     {
         if (encoder == null) {
-            this.encoder = MessagePack.UTF8.newEncoder();
+            this.encoder = MessagePack.UTF8.newEncoder()
+                    .onMalformedInput(CodingErrorAction.REPLACE)
+                    .onUnmappableCharacter(CodingErrorAction.REPLACE);
         }
         encoder.reset();
     }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import java.nio.charset.CharacterCodingException;`
`28`	`28`	`import java.nio.charset.CharsetEncoder;`
`29`	`29`	`import java.nio.charset.CoderResult;`
	`30`	`+import java.nio.charset.CodingErrorAction;`
`30`	`31`
`31`	`32`	`import static org.msgpack.core.MessagePack.Code.ARRAY16;`
`32`	`33`	`import static org.msgpack.core.MessagePack.Code.ARRAY32;`
`@@ -447,7 +448,9 @@ private void packStringWithGetBytes(String s)`
`447`	`448`	`private void prepareEncoder()`
`448`	`449`	`{`
`449`	`450`	`if (encoder == null) {`
`450`		`- this.encoder = MessagePack.UTF8.newEncoder();`
	`451`	`+ this.encoder = MessagePack.UTF8.newEncoder()`
	`452`	`+ .onMalformedInput(CodingErrorAction.REPLACE)`
	`453`	`+ .onUnmappableCharacter(CodingErrorAction.REPLACE);`
`451`	`454`	`}`
`452`	`455`	`encoder.reset();`
`453`	`456`	`}`