From dcd569b9406bd845b829a240ca5a885ec04f5355 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 25 May 2017 16:24:45 -0400 Subject: [PATCH] Revert "Use Thread ContextClassLoader in ConfigurableObjectInputStream" This reverts commit 6e40e5. The fix for SWF-1690 now targets 2.5 only. --- .../snapshot/SerializedFlowExecutionSnapshot.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java index cb0b726d..a91af8e7 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java @@ -248,12 +248,7 @@ public class SerializedFlowExecutionSnapshot extends FlowExecutionSnapshot imple public ConfigurableObjectInputStream(InputStream in, ClassLoader classLoader) throws IOException { super(in); - this.classLoader = initClassLoader(classLoader); - } - - private static ClassLoader initClassLoader(ClassLoader defaultClassLoader) { - ClassLoader result = Thread.currentThread().getContextClassLoader(); - return result != null ? result : defaultClassLoader; + this.classLoader = classLoader; } protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {