Skip to content

Commit dcd569b

Browse files
committed
Revert "Use Thread ContextClassLoader in ConfigurableObjectInputStream"
This reverts commit 6e40e5. The fix for SWF-1690 now targets 2.5 only.
1 parent 5a86845 commit dcd569b

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,7 @@ private static class ConfigurableObjectInputStream extends ObjectInputStream {
248248

249249
public ConfigurableObjectInputStream(InputStream in, ClassLoader classLoader) throws IOException {
250250
super(in);
251-
this.classLoader = initClassLoader(classLoader);
252-
}
253-
254-
private static ClassLoader initClassLoader(ClassLoader defaultClassLoader) {
255-
ClassLoader result = Thread.currentThread().getContextClassLoader();
256-
return result != null ? result : defaultClassLoader;
251+
this.classLoader = classLoader;
257252
}
258253

259254
protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {

0 commit comments

Comments
 (0)