bug fixed external class.

alibaba · Nov 4, 2017 · ea4bfce · ea4bfce
1 parent 1082ddf
commit ea4bfce
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java b/src/main/java/com/alibaba/fastjson/parser/ParserConfig.java
@@ -858,12 +858,16 @@ public Class<?> checkAutoType(String typeName, Class<?> expectClass) {
         }
 
         final String className = typeName.replace('$', '.');
+        Class<?> clazz = null;
 
         if (autoTypeSupport || expectClass != null) {
             for (int i = 0; i < acceptList.length; ++i) {
                 String accept = acceptList[i];
                 if (className.startsWith(accept)) {
-                    return TypeUtils.loadClass(typeName, defaultClassLoader);
+                    clazz = TypeUtils.loadClass(typeName, defaultClassLoader);
+                    if (clazz != null) {
+                        return clazz;
+                    }
                 }
             }
 
@@ -875,7 +879,10 @@ public Class<?> checkAutoType(String typeName, Class<?> expectClass) {
             }
         }
 
-        Class<?> clazz = TypeUtils.getClassFromMapping(typeName);
+        if (clazz == null) {
+            clazz = TypeUtils.getClassFromMapping(typeName);
+        }
+
         if (clazz == null) {
             clazz = deserializers.findClass(typeName);
         }
@@ -900,7 +907,9 @@ public Class<?> checkAutoType(String typeName, Class<?> expectClass) {
             for (int i = 0; i < acceptList.length; ++i) {
                 String accept = acceptList[i];
                 if (className.startsWith(accept)) {
-                    clazz = TypeUtils.loadClass(typeName, defaultClassLoader);
+                    if (clazz == null) {
+                        clazz = TypeUtils.loadClass(typeName, defaultClassLoader);
+                    }
 
                     if (expectClass != null && expectClass.isAssignableFrom(clazz)) {
                         throw new JSONException("type not match. " + typeName + " -> " + expectClass.getName());
@@ -910,7 +919,9 @@ public Class<?> checkAutoType(String typeName, Class<?> expectClass) {
             }
         }
 
-        clazz = TypeUtils.loadClass(typeName, defaultClassLoader);
+        if (clazz == null) {
+            clazz = TypeUtils.loadClass(typeName, defaultClassLoader);
+        }
 
         if (clazz != null) {
             if (TypeUtils.getAnnotation(clazz,JSONType.class) != null) {

diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal3.java b/src/test/java/com/alibaba/json/bvt/TestExternal3.java
@@ -16,7 +16,7 @@
 
 
 public class TestExternal3 extends TestCase {
-    ParserConfig confg = new ParserConfig();
+    ParserConfig confg = ParserConfig.global;
     protected void setUp() throws Exception {
         confg.addAccept("external.VO");
     }

diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal4.java b/src/test/java/com/alibaba/json/bvt/TestExternal4.java
@@ -17,7 +17,7 @@
 import com.alibaba.fastjson.serializer.SerializerFeature;
 
 public class TestExternal4 extends TestCase {
-    ParserConfig confg = new ParserConfig();
+    ParserConfig confg = ParserConfig.global;
     protected void setUp() throws Exception {
         confg.addAccept("external.VO2");
     }

diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal5.java b/src/test/java/com/alibaba/json/bvt/TestExternal5.java
@@ -17,7 +17,7 @@
 import com.alibaba.fastjson.serializer.SerializerFeature;
 
 public class TestExternal5 extends TestCase {
-    ParserConfig confg = new ParserConfig();
+    ParserConfig confg = ParserConfig.global;
     protected void setUp() throws Exception {
         confg.addAccept("com.alibaba.dubbo.demo");
     }
@@ -37,9 +37,11 @@ public void test_0() throws Exception {
 
         String text = JSON.toJSONString(obj, SerializerFeature.WriteClassName, SerializerFeature.WriteMapNullValue);
         System.out.println(text);
-        JSON.parseObject(text, clazz, confg);
-        String clazzName = JSON.parse(text, confg).getClass().getName();
-        Assert.assertEquals(clazz.getName(), clazzName);
+        Object object = JSON.parseObject(text, clazz, confg);
+        assertEquals("a1", clazz.getName(), object.getClass().getName());
+
+        Object object2 = JSON.parse(text, confg);
+        assertEquals("a2 " + text, clazz.getName(), object2.getClass().getName());
     }
 
     public static class ExtClassLoader extends ClassLoader {

diff --git a/src/test/java/com/alibaba/json/bvt/TestExternal6.java b/src/test/java/com/alibaba/json/bvt/TestExternal6.java
@@ -17,7 +17,7 @@
 import com.alibaba.fastjson.serializer.SerializerFeature;
 
 public class TestExternal6 extends TestCase {
-    ParserConfig confg = new ParserConfig();
+    ParserConfig confg = ParserConfig.global;
 
     protected void setUp() throws Exception {
         confg.addAccept("org.mule.esb.model");