andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moving classLoader selection to constructor

Browse Source
This commit is contained in:
alepar 2011-11-22 15:54:59 +04:00
parent dd567e059f
commit c7cea76d2f
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
View File

@ -42,7 +42,11 @@ class CompactObjectInputStream extends ObjectInputStream {
CompactObjectInputStream(InputStream in, ClassLoader classLoader) throws IOException {
super(in);
this.classLoader = classLoader;
if (classLoader == null) {
this.classLoader = defaultClassLoader();
} else {
this.classLoader = classLoader;
}
}
@Override
@ -95,18 +99,19 @@ class CompactObjectInputStream extends ObjectInputStream {
}
// And then try to load.
ClassLoader classLoader = this.classLoader;
if (classLoader == null) {
classLoader = Thread.currentThread().getContextClassLoader();
}
if (classLoader != null) {
clazz = classLoader.loadClass(className);
} else {
clazz = Class.forName(className);
}
clazz = classLoader.loadClass(className);
classCache.put(className, clazz);
return clazz;
}
private static ClassLoader defaultClassLoader() {
final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
if (contextClassLoader != null) {
return contextClassLoader;
}
return CompactObjectInputStream.class.getClassLoader();
}
}