Move encoder.reset() to prepareEncoder()

xerial · xerial · commit e65e7b737274 · 2016-04-11T11:12:27.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
@@ -449,6 +449,7 @@ private void prepareEncoder()
         if (encoder == null) {
             this.encoder = MessagePack.UTF8.newEncoder();
         }
+        encoder.reset();
     }
 
     private int encodeStringToBufferAt(int pos, String s)
@@ -457,7 +458,6 @@ private int encodeStringToBufferAt(int pos, String s)
         ByteBuffer bb = buffer.sliceAsByteBuffer(pos, buffer.size() - pos);
         int startPosition = bb.position();
         CharBuffer in = CharBuffer.wrap(s);
-        encoder.reset();
         CoderResult cr = encoder.encode(in, bb, true);
         if (cr.isError()) {
             try {
@@ -471,7 +471,7 @@ 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
+        // NOTE: This flush method does nothing if we use UTF8 encoder, but other general encoders require this
         cr = encoder.flush(bb);
         if (!cr.isUnderflow()) {
             return -1;
