Merge pull request #11 from vmarkovtsev/master

Dramatically speedup reading byte arrays

Author: tcalmant

javaobj.py

@@ -339,6 +339,17 @@ def __init__(self, classdesc=None):
         JavaObject.__init__(self)
         self.classdesc = classdesc
 
+
+class JavaByteArray(bytearray, JavaObject):
+    """
+    Represents the special case of Java Array which contains bytes
+    """
+
+    def __init__(self, data, classdesc=None):
+        bytearray.__init__(self, data)
+        JavaObject.__init__(self)
+        self.classdesc = classdesc
+
 # ------------------------------------------------------------------------------
 
 
@@ -903,6 +914,8 @@ def do_array(self, parent=None, ident=0):
                 _, res = self._read_and_exec_opcode(ident=ident + 1)
                 log_debug("Object value: {0}".format(res), ident)
                 array.append(res)
+        elif type_char == self.TYPE_BYTE:
+            array = JavaByteArray(self.object_stream.read(size), classdesc)
         else:
             for _ in range(size):
                 res = self._read_value(type_char, ident)
@@ -1465,7 +1478,8 @@ def _write_value(self, field_type, value):
                 self.write_null()
             elif isinstance(value, JavaEnum):
                 self.write_enum(value)
-            elif isinstance(value, JavaArray):
+            elif isinstance(value, JavaArray) \
+                    or isinstance(value, JavaByteArray):
                 self.write_array(value)
             elif isinstance(value, JavaObject):
                 self.write_object(value)

tests/tests.py

@@ -148,7 +148,7 @@ def test_class_with_byte_array_rw(self):
         jobj = self.read_file("testClassWithByteArray.ser")
         pobj = javaobj.loads(jobj)
 
-        self.assertEqual(pobj.myArray, [1,3,7,11])
+        self.assertEqual(pobj.myArray, b"\x01\x03\x07\x0b")
         self._try_marshalling(jobj, pobj)
 
     def test_boolean(self):