From 52774a3f4b32ab90efd389445d8cd7375ddc3391 Mon Sep 17 00:00:00 2001 From: mkoch Date: Fri, 6 Feb 2004 14:05:37 +0000 Subject: 2004-02-06 Michael Koch * java/io/ObjectInputStream.java (currentClassLoader): Reverted to old version of this method. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77397 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/io/ObjectInputStream.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libjava/java/io') diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index d0def09181c..e471b6d7d59 100644 --- a/libjava/java/io/ObjectInputStream.java +++ b/libjava/java/io/ObjectInputStream.java @@ -1737,7 +1737,11 @@ public class ObjectInputStream extends InputStream * @param sm SecurityManager instance which should be called. * @return The current class loader in the calling stack. */ - private static native ClassLoader currentClassLoader (SecurityManager sm); + private static ClassLoader currentClassLoader (SecurityManager sm) + { + // FIXME: This is too simple. + return ClassLoader.getSystemClassLoader (); + } private void callReadMethod (Method readObject, Class klass, Object obj) throws IOException { -- cgit v1.2.3