Ensure flushing CharsetEncoder

xerial · xerial · commit 86f443c67b7f · 2016-04-08T10:36:54.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
@@ -471,6 +471,11 @@ private int encodeStringToBufferAt(int pos, String s)
             // Underflow should be on to ensure all of the input string is encoded
             return -1;
         }
+        // NOTE: This flush method does nothing if we use UTR8 encoder, but other general encoders require this
+        cr = encoder.flush(bb);
+        if (!cr.isUnderflow()) {
+            return -1;
+        }
         return bb.position() - startPosition;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -471,6 +471,11 @@ private int encodeStringToBufferAt(int pos, String s)`
`471`	`471`	`// Underflow should be on to ensure all of the input string is encoded`
`472`	`472`	`return -1;`
`473`	`473`	`}`
	`474`	`+ // NOTE: This flush method does nothing if we use UTR8 encoder, but other general encoders require this`
	`475`	`+ cr = encoder.flush(bb);`
	`476`	`+ if (!cr.isUnderflow()) {`
	`477`	`+ return -1;`
	`478`	`+ }`
`474`	`479`	`return bb.position() - startPosition;`
`475`	`480`	`}`
`476`	`481`