diff options
| author | Neil Fuller <nfuller@google.com> | 2014-05-13 10:14:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-13 10:14:04 +0000 |
| commit | c03fdbdeda2f1885039f51c7eb1527eac7078a2c (patch) | |
| tree | 92be367b53c033ba55f5a2b5b8d447f17a512da7 /luni | |
| parent | 01a1441df76f62e74c5a9ed76ff8feeff8dc454a (diff) | |
| parent | be69af034f8e996f0152790df1acc39fa94e25de (diff) | |
| download | libcore-c03fdbdeda2f1885039f51c7eb1527eac7078a2c.zip libcore-c03fdbdeda2f1885039f51c7eb1527eac7078a2c.tar.gz libcore-c03fdbdeda2f1885039f51c7eb1527eac7078a2c.tar.bz2 | |
Merge "Fix ObjectInputStream proxy de-serialization"
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/java/java/io/ObjectInputStream.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/luni/src/main/java/java/io/ObjectInputStream.java b/luni/src/main/java/java/io/ObjectInputStream.java index 35f6fc1..d07075f 100644 --- a/luni/src/main/java/java/io/ObjectInputStream.java +++ b/luni/src/main/java/java/io/ObjectInputStream.java @@ -1736,9 +1736,7 @@ public class ObjectInputStream extends InputStream implements ObjectInput, Objec */ protected Class<?> resolveProxyClass(String[] interfaceNames) throws IOException, ClassNotFoundException { - // TODO: This method is opportunity for performance enhancement - // We can cache the classloader and recently used interfaces. - ClassLoader loader = ClassLoader.getSystemClassLoader(); + ClassLoader loader = callerClassLoader; Class<?>[] interfaces = new Class<?>[interfaceNames.length]; for (int i = 0; i < interfaceNames.length; i++) { interfaces[i] = Class.forName(interfaceNames[i], false, loader); |