Skip to content

Commit ae4160e

Browse files
committed
Avoid direct use of non-exported XStream CompositeClassLoader class
Closes gh-25662
1 parent bb9e79d commit ae4160e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
4848
import com.thoughtworks.xstream.core.ClassLoaderReference;
4949
import com.thoughtworks.xstream.core.DefaultConverterLookup;
50-
import com.thoughtworks.xstream.core.util.CompositeClassLoader;
5150
import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
5251
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
5352
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
@@ -186,7 +185,8 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo
186185
@Nullable
187186
private Class<?>[] supportedClasses;
188187

189-
private ClassLoader beanClassLoader = new CompositeClassLoader();
188+
@Nullable
189+
private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
190190

191191
private final SingletonSupplier<XStream> xstream = SingletonSupplier.of(this::buildXStream);
192192

0 commit comments

Comments
 (0)