From 3298fd35f7da7f77a0c2b8574f450b2c3ea286bd Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 6 Feb 2004 14:05:37 +0000 Subject: [PATCH] 2004-02-06 Michael Koch * java/io/ObjectInputStream.java (currentClassLoader): Reverted to old version of this method. From-SVN: r77397 --- libjava/ChangeLog | 5 +++++ libjava/java/io/ObjectInputStream.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 204cd716413..69795b95001 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 Michael Koch + + * java/io/ObjectInputStream.java + (currentClassLoader): Reverted to old version of this method. + 2004-02-06 Jeroen Frijters * java/io/ObjectInputStream.java: Made all calls 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 {