diff options
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/java/java/io/ObjectInputStream.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/luni/src/main/java/java/io/ObjectInputStream.java b/luni/src/main/java/java/io/ObjectInputStream.java index 0476901..0b15161 100644 --- a/luni/src/main/java/java/io/ObjectInputStream.java +++ b/luni/src/main/java/java/io/ObjectInputStream.java @@ -2000,7 +2000,7 @@ public class ObjectInputStream extends InputStream implements ObjectInput, Objec // original/outside caller if (++nestedLevels == 1) { // Remember the caller's class loader - callerClassLoader = getClosestUserClassLoader(); + callerClassLoader = VMStack.getClosestUserClassLoader(bootstrapLoader, systemLoader); } result = readNonPrimitiveContent(unshared); @@ -2041,23 +2041,6 @@ public class ObjectInputStream extends InputStream implements ObjectInput, Objec private static final ClassLoader systemLoader = ClassLoader.getSystemClassLoader(); /** - * Searches up the call stack to find the closest user-defined class loader. - * - * @return a user-defined class loader or null if one isn't found - */ - private static ClassLoader getClosestUserClassLoader() { - Class<?>[] stackClasses = VMStack.getClasses(-1); - for (Class<?> stackClass : stackClasses) { - ClassLoader loader = stackClass.getClassLoader(); - if (loader != null && loader != bootstrapLoader - && loader != systemLoader) { - return loader; - } - } - return null; - } - - /** * Method to be overridden by subclasses to read the next object from the * source stream. * |