fixed AbstractRawValue.toString

frsyuki · frsyuki · commit 10aa4510e9b3 · 2011-08-14T09:43:10.000+09:00
diff --git a/src/main/java/org/msgpack/packer/JSONPacker.java b/src/main/java/org/msgpack/packer/JSONPacker.java
@@ -307,29 +307,31 @@ private static void escape(Output out, String s) throws IOException {
         for(int i=0; i < chars.length; i++) {
             int ch = chars[i];
             if (ch <= 0x7f) {
-                 int e = ESCAPE_TABLE[ch];
-                 if (e == 0) {
-                     tmp[2] = (byte) ch;
-                     out.write(tmp, 2, 1);
-                 } else if (e > 0) {
-                     tmp[2] = BACKSLASH;
-                     tmp[3] = (byte) e;
-                     out.write(tmp, 2, 2);
-                 } else {
-                     // control char
-                     tmp[2] = ZERO;
-                     tmp[3] = ZERO;
-                     tmp[4] = HEX_TABLE[ch >> 4];
-                     tmp[5] = HEX_TABLE[ch & 0x0f];
-                     out.write(tmp, 0, 6);
+                int e = ESCAPE_TABLE[ch];
+                if (e == 0) {
+                    // ascii char
+                    tmp[2] = (byte) ch;
+                    out.write(tmp, 2, 1);
+                } else if (e > 0) {
+                    // popular control char
+                    tmp[2] = BACKSLASH;
+                    tmp[3] = (byte) e;
+                    out.write(tmp, 2, 2);
+                } else {
+                    // control char uXXXXXX
+                    tmp[2] = ZERO;
+                    tmp[3] = ZERO;
+                    tmp[4] = HEX_TABLE[ch >> 4];
+                    tmp[5] = HEX_TABLE[ch & 0x0f];
+                    out.write(tmp, 0, 6);
                 }
             } else if (ch <= 0x7ff) {
                 // 2-bytes char
                 tmp[2] = (byte) (0xc0 | (ch >> 6));
                 tmp[3] = (byte) (0x80 | (ch & 0x3f));
                 out.write(tmp, 2, 2);
             } else if (ch >= 0xd800 && ch <= 0xdfff) {
-                // outside of BMP
+                // surrogates
                 tmp[2] = HEX_TABLE[(ch >> 12) & 0x0f];
                 tmp[3] = HEX_TABLE[(ch >> 8) & 0x0f];
                 tmp[4] = HEX_TABLE[(ch >> 4) & 0x0f];
diff --git a/src/main/java/org/msgpack/type/AbstractRawValue.java b/src/main/java/org/msgpack/type/AbstractRawValue.java
@@ -78,10 +78,11 @@ public StringBuilder toString(StringBuilder sb) {
                     sb.append("\\b");
                     break;
                 default:
+                    // control chars
                     escapeChar(sb, ch);
                     break;
                 }
-            } else {
+            } else if(ch <= 0x7f) {
                 switch(ch) {
                 case '\\':
                     sb.append("\\\\");
@@ -93,18 +94,25 @@ public StringBuilder toString(StringBuilder sb) {
                     sb.append(ch);
                     break;
                 }
+            } else if(ch >= 0xd800 && ch <= 0xdfff) {
+                // surrogates
+                escapeChar(sb, ch);
+            } else {
+                sb.append(ch);
             }
         }
         sb.append("\"");
         return sb;
     }
 
-    private void escapeChar(StringBuilder sb, char ch) {
+    private final static char[] HEX_TABLE = "0123456789ABCDEF".toCharArray();
+
+    private void escapeChar(StringBuilder sb, int ch) {
         sb.append("\\u");
-        sb.append(((int)ch >> 12) & 0xF);
-        sb.append(((int)ch >> 8) & 0xF);
-        sb.append(((int)ch >> 4) & 0xF);
-        sb.append((int)ch & 0xF);
+        sb.append(HEX_TABLE[(ch >> 12) & 0x0f]);
+        sb.append(HEX_TABLE[(ch >> 8) & 0x0f]);
+        sb.append(HEX_TABLE[(ch >> 4) & 0x0f]);
+        sb.append(HEX_TABLE[ch & 0x0f]);
     }
 }
 
diff --git a/src/test/java/org/msgpack/TestValueToStringJSONUnpack.java b/src/test/java/org/msgpack/TestValueToStringJSONUnpack.java
