AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We need to use the thread context classloader if one has not been specified.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5939 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2009-09-07 20:39:32 +00:00
parent 2acedb91a4
commit f3fd4d28a5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/io/ObjectInputStream.java
+5 -3
View File
@@ -239,7 +239,9 @@ public class ObjectInputStream extends DataInputStream
throws IOException, ClassNotFoundException throws IOException, ClassNotFoundException
{ {
// resolve the class and streamer // resolve the class and streamer
Class<?> sclass = Class.forName(cname, true, _loader); ClassLoader loader = (_loader != null) ? _loader :
Thread.currentThread().getContextClassLoader();
Class<?> sclass = Class.forName(cname, true, loader);
Streamer streamer = Streamer.getStreamer(sclass); Streamer streamer = Streamer.getStreamer(sclass);
if (STREAM_DEBUG) { if (STREAM_DEBUG) {
log.info(hashCode() + ": New class '" + cname + "'", "code", code); log.info(hashCode() + ": New class '" + cname + "'", "code", code);
@@ -323,8 +325,8 @@ public class ObjectInputStream extends DataInputStream
/** The streamer being used currently. */ /** The streamer being used currently. */
protected Streamer _streamer; protected Streamer _streamer;
/** The class loader we use to instantiate objects. */ /** If set, an overridden class loader used to instantiate objects. */
protected ClassLoader _loader = getClass().getClassLoader(); protected ClassLoader _loader;
/** An optional set of class name translations to use when unserializing objects. */ /** An optional set of class name translations to use when unserializing objects. */
protected HashMap<String, String> _translations; protected HashMap<String, String> _translations;