diff --git a/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java b/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java index 36b962b446..6f7725e9b7 100644 --- a/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java +++ b/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java @@ -420,20 +420,28 @@ public ObjectDeserializer getDeserializer(Class clazz, Type type) { public ObjectDeserializer createJavaBeanDeserializer(Class clazz, Type type) { boolean asmEnable = this.asmEnable; if (asmEnable) { - Class superClass = JavaBeanInfo.getBuilderClass(clazz.getAnnotation(JSONType.class)); - if (superClass == null) { - superClass = clazz; + JSONType jsonType = clazz.getAnnotation(JSONType.class); + + if (jsonType != null && !jsonType.asm()) { + asmEnable = false; } - - for (;;) { - if (!Modifier.isPublic(superClass.getModifiers())) { - asmEnable = false; - break; + + if (asmEnable) { + Class superClass = JavaBeanInfo.getBuilderClass(jsonType); + if (superClass == null) { + superClass = clazz; } - - superClass = superClass.getSuperclass(); - if (superClass == Object.class || superClass == null) { - break; + + for (;;) { + if (!Modifier.isPublic(superClass.getModifiers())) { + asmEnable = false; + break; + } + + superClass = superClass.getSuperclass(); + if (superClass == Object.class || superClass == null) { + break; + } } } } diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_372.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_372.java new file mode 100644 index 0000000000..67cb27cfda --- /dev/null +++ b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_issue_372.java @@ -0,0 +1,23 @@ +package com.alibaba.json.bvt.bug; + +import org.junit.Assert; + +import com.alibaba.fastjson.annotation.JSONType; +import com.alibaba.fastjson.parser.ParserConfig; +import com.alibaba.fastjson.parser.deserializer.JavaBeanDeserializer; +import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer; + +import junit.framework.TestCase; + +public class Bug_for_issue_372 extends TestCase { + public void test_for_issue() throws Exception { + ParserConfig config = new ParserConfig(); + ObjectDeserializer deser = config.getDeserializer(Model.class); + Assert.assertEquals(JavaBeanDeserializer.class, deser.getClass()); + } + + @JSONType(asm=false) + public static class Model { + + } +}