Merge pull request #10 from voetsjoeba/master

Fixed byte[] member fields getting serialized as TC_OBJECT instead of TC_ARRAY

Author: tcalmant

javaobj.py

@@ -1357,6 +1357,8 @@ def _write_value(self, field_type, value):
                 self.write_null()
             elif isinstance(value, JavaEnum):
                 self.write_enum(value)
+            elif isinstance(value, JavaArray):
+                self.write_array(value)
             elif isinstance(value, JavaObject):
                 self.write_object(value)
             elif isinstance(value, JavaString):

tests/java/src/test/java/OneTest.java

@@ -26,6 +26,11 @@ class ClassWithEnum implements Serializable {
 	public Color[] colors = { Color.GREEN, Color.BLUE, Color.RED };
 }
 
+class ClassWithByteArray implements Serializable {
+	private static final long serialVersionUID = 1L;
+	public byte[] myArray = new byte[]{1,3,7,11};
+}
+
 enum Color {
 	BLUE("BLUE"), GREEN("GREEN"), RED("RED"), UNKNOWN("UNKNOWN");
 	private final String value;
@@ -221,6 +226,13 @@ public void testException() throws Exception {
 		}
 	}
 
+	@Test
+	public void testClassWithByteArray() throws Exception {
+		final ClassWithByteArray cwba = new ClassWithByteArray();
+		oos.writeObject(cwba);
+		oos.flush();
+	}
+
 	@Test
 	public void testSuper() throws Exception {
 		oos = new ObjectOutputStream(fos = new FileOutputStream("objSuper.ser"));

tests/testClassWithByteArray.ser

@@ -129,6 +129,16 @@ def test_bytes_rw(self):
         jobj_ = javaobj.dumps(pobj)
         self.assertEqual(jobj, jobj_)
 
+    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])
+
+        jobj_ = javaobj.dumps(pobj)
+        javaobj.loads(jobj_)
+        self.assertEqual(jobj, jobj_)
+
     def test_boolean(self):
         """
         Reads testBoolean.ser and checks the serialization process