DUBBO-627 fix bug

zhanghanlin · Jan 9, 2013 · e3f8af7 · e3f8af7
1 parent e8970a0
commit e3f8af7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtil.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtil.java
@@ -101,7 +101,7 @@ private static void serializeInternal(JavaBeanDescriptor descriptor, Object obj,
             for (int i = 0; i < len; i++) {
                 Object item = Array.get(obj, i);
                 if (item == null) {
-                    descriptor.setProperty(i++, null);
+                    descriptor.setProperty(i, null);
                 } else {
                     JavaBeanDescriptor itemDescriptor = createDescriptorIfAbsent(item, accessor, cache);
                     descriptor.setProperty(i, itemDescriptor);

diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
@@ -79,6 +79,19 @@ public void testSerialize_Array() throws Exception {
                                 ((JavaBeanDescriptor) descriptor.getProperty(i)).getPrimitiveProperty());
         }
 
+        Integer[] integers = new Integer[]{1, 2, 3, 4, null, null, null};
+        descriptor = JavaBeanSerializeUtil.serialize(integers, JavaBeanAccessor.METHOD);
+        Assert.assertTrue(descriptor.isArrayType());
+        Assert.assertEquals(Integer.class.getName(), descriptor.getClassName());
+        Assert.assertEquals(integers.length, descriptor.propertySize());
+        for(int i = 0; i < integers.length; i++) {
+            if (integers[i] == null) {
+                Assert.assertTrue(integers[i] == descriptor.getProperty(i));
+            } else {
+                Assert.assertEquals(integers[i], ((JavaBeanDescriptor)descriptor.getProperty(i)).getPrimitiveProperty());
+            }
+        }
+
         int[][] second = {{1, 2}, {3, 4}};
         descriptor = JavaBeanSerializeUtil.serialize(second, JavaBeanAccessor.METHOD);
         Assert.assertTrue(descriptor.isArrayType());