From ae4160e13133a9e0ae2d1d477d387e4cf511aa5a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 30 Aug 2020 12:15:45 +0200 Subject: [PATCH] Avoid direct use of non-exported XStream CompositeClassLoader class Closes gh-25662 --- .../org/springframework/oxm/xstream/XStreamMarshaller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index 090ae9f167ff..881529d211b5 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -47,7 +47,6 @@ import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.core.ClassLoaderReference; import com.thoughtworks.xstream.core.DefaultConverterLookup; -import com.thoughtworks.xstream.core.util.CompositeClassLoader; import com.thoughtworks.xstream.io.HierarchicalStreamDriver; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; @@ -186,7 +185,8 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo @Nullable private Class[] supportedClasses; - private ClassLoader beanClassLoader = new CompositeClassLoader(); + @Nullable + private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); private final SingletonSupplier xstream = SingletonSupplier.of(this::buildXStream);