Revert "Use Thread ContextClassLoader in ConfigurableObjectInputStream"

This reverts commit 6e40e5. The fix for SWF-1690 now targets 2.5 only.
This commit is contained in:
Rossen Stoyanchev
2017-05-25 16:24:45 -04:00
parent 5a86845b09
commit dcd569b940

View File

@@ -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 {