Fix serialization / deserialization of char array.

Author: moriyoshi

javaobj.py

@@ -126,6 +126,8 @@ def read_to_str(data):
         """
         return ''.join(chr(char) for char in data)
 
+    unichr = chr
+
 else:
     # Python 2 interpreter : str & unicode
     def to_str(data, encoding="UTF-8"):
@@ -1078,10 +1080,7 @@ def _read_value(self, field_type, ident, name=""):
         elif field_type == self.TYPE_BYTE:
             (res,) = self._readStruct(">b")
         elif field_type == self.TYPE_CHAR:
-            # TYPE_CHAR is defined by the serialization specification
-            # but not used in the implementation, so this is
-            # a hypothetical code
-            res = bytes(self._readStruct(">bb")).decode("utf-16-be")
+            res = unichr(self._readStruct(">H")[0])
         elif field_type == self.TYPE_SHORT:
             (res,) = self._readStruct(">h")
         elif field_type == self.TYPE_INTEGER:
@@ -1531,6 +1530,8 @@ def _write_value(self, field_type, value):
             self._writeStruct(">B", 1, (1 if value else 0,))
         elif field_type == self.TYPE_BYTE:
             self._writeStruct(">b", 1, (value,))
+        elif field_type == self.TYPE_CHAR:
+            self._writeStruct(">H", 1, (ord(value),))
         elif field_type == self.TYPE_SHORT:
             self._writeStruct(">h", 1, (value,))
         elif field_type == self.TYPE_INTEGER:

tests/testCharArray.ser

@@ -280,6 +280,13 @@ def test_arrays(self):
 
         self._try_marshalling(jobj, pobj)
 
+    def test_char_array(self):
+        jobj = self.read_file("testCharArray.ser")
+        pobj = javaobj.loads(jobj)
+        _logger.debug(pobj)
+        self.assertEqual(pobj, ['\u0000', '\ud800', '\u0001', '\udc00', '\u0002', '\uffff', '\u0003'])
+        self._try_marshalling(jobj, pobj)
+
     def test_enums(self):
         jobj = self.read_file("objEnums.ser")
         pobj = javaobj.loads(jobj)