bug fixed for ValueFilter

alibaba · Apr 19, 2016 · 1cd9d07 · 1cd9d07
1 parent bd6b30e
commit 1cd9d07
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/serializer/ASMSerializerFactory.java b/src/main/java/com/alibaba/fastjson/serializer/ASMSerializerFactory.java
@@ -1445,7 +1445,7 @@ private void _processValue(MethodVisitor mw, FieldInfo property, Context context
         if (propertyClass.isPrimitive()) {
             Label _end_checkValue = new Label();
             mw.visitVarInsn(ILOAD, context.var("checkValue"));
-            mw.visitJumpInsn(IFEQ, _end_checkValue);
+            mw.visitJumpInsn(IFNE, _end_checkValue);
 
             mw.visitInsn(ACONST_NULL);
             mw.visitInsn(DUP);

diff --git a/src/test/java/com/alibaba/json/bvt/serializer/filters/MTopFilterTest.java b/src/test/java/com/alibaba/json/bvt/serializer/filters/MTopFilterTest.java
@@ -1,5 +1,7 @@
 package com.alibaba.json.bvt.serializer.filters;
 
+import java.util.HashMap;
+
 import org.junit.Assert;
 
 import com.alibaba.fastjson.JSON;
@@ -14,18 +16,26 @@ public void test_0() throws Exception {
         model.id = 1001;
         model.name = "yongbo";
         model.user = new Person();
-        model.user.id = 2002;
+        model.user.personId = 2002;
 
+        final HashMap<String, Object> values = new HashMap<String, Object>();
         ValueFilter valueFilter = new ValueFilter() {
 
             @Override
             public Object process(Object object, String name, Object value) {
+                values.put(name, value);
                 return value;
             }
         };
-
+        
         String jsonString = JSON.toJSONString(model, valueFilter);
-        Assert.assertEquals("{\"id\":1001,\"name\":\"yongbo\",\"user\":{\"id\":2002}}", jsonString);
+        Assert.assertEquals("{\"id\":1001,\"name\":\"yongbo\",\"user\":{\"personId\":2002}}", jsonString);
+
+        Assert.assertEquals(4, values.size());
+        Assert.assertEquals(model.id, values.get("id"));
+        Assert.assertSame(model.name, values.get("name"));
+        Assert.assertEquals(model.user, values.get("user"));
+        Assert.assertEquals(model.user.personId, values.get("personId"));
     }
 
     public static class Model {
@@ -62,14 +72,14 @@ public void setName(String name) {
 
     public static class Person {
 
-        private int id;
+        private int personId;
 
-        public int getId() {
+        public int getPersonId() {
-            return id;
+            return personId;
         }
 
-        public void setId(int id) {
+        public void setPersonId(int personId) {
-            this.id = id;
+            this.personId = personId;
         }
 
     }