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

komamitsu · komamitsu · commit 430b1e7a4748 · 2014-12-20T17:07:13.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/RawValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/RawValueImpl.java
@@ -62,11 +62,13 @@ private synchronized void decodeString() {
         if (decodedStringCache != null) {
             return;
         }
+        ByteBuffer readOnlyBuffer = byteBuffer.asReadOnlyBuffer();
         try {
             CharsetDecoder reportDecoder = Charset.forName("UTF-8").newDecoder()
                     .onMalformedInput(CodingErrorAction.REPLACE)
                     .onUnmappableCharacter(CodingErrorAction.REPLACE);
-            decodedStringCache = reportDecoder.decode(byteBuffer.asReadOnlyBuffer()).toString();
+            readOnlyBuffer.position(0);
+            decodedStringCache = reportDecoder.decode(readOnlyBuffer).toString();
         } catch (UnsupportedCharsetException neverThrown) {
             throw new AssertionError(neverThrown);
         } catch (CharacterCodingException ex) {
@@ -75,7 +77,8 @@ private synchronized void decodeString() {
                 CharsetDecoder replaceDecoder = Charset.forName("UTF-8").newDecoder()
                         .onMalformedInput(CodingErrorAction.REPLACE)
                         .onUnmappableCharacter(CodingErrorAction.REPLACE);
-                decodedStringCache = replaceDecoder.decode(byteBuffer.asReadOnlyBuffer()).toString();
+                readOnlyBuffer.position(0);
+                decodedStringCache = replaceDecoder.decode(readOnlyBuffer).toString();
             } catch (UnsupportedCharsetException neverThrown) {
                 throw new AssertionError(neverThrown);
             } catch (CharacterCodingException neverThrown) {
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/RawValueImplTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/RawValueImplTest.scala
@@ -0,0 +1,38 @@
+package org.msgpack.value
+
+import scala.util.Random
+import org.msgpack.core.MessagePack.Code
+import org.msgpack.core.{MessagePack, MessageFormat, MessageFormatException, MessagePackSpec}
+import org.msgpack.core.MessagePack.Code._
+import java.io.ByteArrayOutputStream
+
+
+class RawValueImplTest extends MessagePackSpec {
+
+  "RawValueImple" should {
+    "toString shouldn't return empty value" in {
+      val str = "aaa"
+      def newRawStr() = ValueFactory.newRawString(str.getBytes("UTF-8"))
+
+      def pack(v: Value): Array[Byte] = {
+        val out = new ByteArrayOutputStream()
+        val packer = MessagePack.newDefaultPacker(out)
+        packer.packValue(v)
+        packer.close()
+        out.toByteArray
+      }
+
+      {
+        val rawStr = newRawStr()
+        pack(rawStr)
+        rawStr.toString() shouldBe str
+      }
+
+      {
+        val rawStr = newRawStr()
+        pack(rawStr)
+        rawStr.asString().toString shouldBe str
+      }
+    }
+  }
+}
