Skip to content

Commit

Permalink
Revert "Use Thread ContextClassLoader in ConfigurableObjectInputStream"
Browse files Browse the repository at this point in the history
This reverts commit 6e40e5. The fix for SWF-1690 now targets 2.5 only.
  • Loading branch information
rstoyanchev committed May 25, 2017
1 parent 5a86845 commit dcd569b
Showing 1 changed file with 1 addition and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,7 @@ private static class ConfigurableObjectInputStream extends ObjectInputStream {

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 {
Expand Down

0 comments on commit dcd569b

Please sign in to comment.