- Use Thread Context ClassLoader. Replace only when URLClassLoader

kiegroup · Aug 5, 2020 · 3f01403 · 3f01403
1 parent 2f1f5a6
commit 3f01403
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/...rent/kie-server-api/src/main/java/org/kie/server/api/marshalling/json/JSONMarshaller.java b/...rent/kie-server-api/src/main/java/org/kie/server/api/marshalling/json/JSONMarshaller.java
@@ -21,6 +21,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Array;
 import java.lang.reflect.Member;
+import java.net.URLClassLoader;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -72,7 +73,6 @@
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.jsontype.impl.AsWrapperTypeDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
@@ -281,7 +281,6 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config, Java
 
             deserializeObjectMapper.registerModule(modDeser);
             deserializeObjectMapper.setConfig(deserializeObjectMapper.getDeserializationConfig().with(introspectorPair));
-            deserializeObjectMapper.setTypeFactory(TypeFactory.defaultInstance().withClassLoader(classLoader));
         }
 
         if (formatDate) {
@@ -868,7 +867,7 @@ protected CustomAsWrapperTypeDeserializer(AsWrapperTypeDeserializer src, BeanPro
         public Object deserializeTypedFromArray(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             ClassLoader current = Thread.currentThread().getContextClassLoader();
             try {
-                Thread.currentThread().setContextClassLoader(_baseType.getRawClass().getClassLoader());
+                Thread.currentThread().setContextClassLoader(getClassLoaderForDeserialization());
                 JsonDeserializer<Object> deser = _findDeserializer(ctxt, baseTypeName());
                 Object value = deser.deserialize(jp, ctxt);
                 return value;
@@ -881,7 +880,7 @@ public Object deserializeTypedFromArray(JsonParser jp, DeserializationContext ct
         public Object deserializeTypedFromObject(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             ClassLoader current = Thread.currentThread().getContextClassLoader();
             try {
-                Thread.currentThread().setContextClassLoader(_baseType.getRawClass().getClassLoader());
+                Thread.currentThread().setContextClassLoader(getClassLoaderForDeserialization());
                 if (classesSet.contains(_baseType.getRawClass()) && !jsonContext.get().isStripped()) {
 
                     try {
@@ -905,7 +904,7 @@ public Object deserializeTypedFromObject(JsonParser jp, DeserializationContext c
         public Object deserializeTypedFromScalar(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             ClassLoader current = Thread.currentThread().getContextClassLoader();
             try {
-                Thread.currentThread().setContextClassLoader(_baseType.getRawClass().getClassLoader());
+                Thread.currentThread().setContextClassLoader(getClassLoaderForDeserialization());
                 if (classesSet.contains(_baseType.getRawClass())) {
                     try {
                         return super.deserializeTypedFromScalar(jp, ctxt);
@@ -927,7 +926,7 @@ public Object deserializeTypedFromScalar(JsonParser jp, DeserializationContext c
         public Object deserializeTypedFromAny(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
             ClassLoader current = Thread.currentThread().getContextClassLoader();
             try {
-                Thread.currentThread().setContextClassLoader(_baseType.getRawClass().getClassLoader());
+                Thread.currentThread().setContextClassLoader(getClassLoaderForDeserialization());
                 if (classesSet.contains(_baseType.getRawClass())) {
                     try {
                         return super.deserializeTypedFromAny(jp, ctxt);
@@ -972,6 +971,15 @@ public Object deserializeTypedFromAny(JsonParser jp, DeserializationContext ctxt
             }
         }
 
+        private ClassLoader getClassLoaderForDeserialization() {
+            ClassLoader baseTypeClassLoader = _baseType.getRawClass().getClassLoader();
+            if (baseTypeClassLoader instanceof URLClassLoader) {
+                return classLoader;
+            } else {
+                return baseTypeClassLoader;
+            }
+        }
+
         @Override
         public TypeDeserializer forProperty(BeanProperty prop) {
             if (prop != null) {