diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-06 14:05:37 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-06 14:05:37 +0000 |
| commit | 52774a3f4b32ab90efd389445d8cd7375ddc3391 (patch) | |
| tree | 7c9116710e17030a87d64e39692da6e0d7cb494e /libjava | |
| parent | f2a3e89e5736133b154fa48e0d46c957be4fbe13 (diff) | |
| download | gcc-52774a3f4b32ab90efd389445d8cd7375ddc3391.tar.gz | |
2004-02-06 Michael Koch <konqueror@gmx.de>
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/io/ObjectInputStream.java | 6 |
2 files changed, 10 insertions, 1 deletions
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 <konqueror@gmx.de> + + * java/io/ObjectInputStream.java + (currentClassLoader): Reverted to old version of this method. + 2004-02-06 Jeroen Frijters <jeroen@frijters.net> * 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 { |