diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-02-06 14:05:37 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-02-06 14:05:37 +0000 |
| commit | 3298fd35f7da7f77a0c2b8574f450b2c3ea286bd (patch) | |
| tree | 7c9116710e17030a87d64e39692da6e0d7cb494e /libjava/java | |
| parent | 736b64ddb4ee34d7f05f9522ffb1f5ada4585b7d (diff) | |
| download | gcc-3298fd35f7da7f77a0c2b8574f450b2c3ea286bd.zip gcc-3298fd35f7da7f77a0c2b8574f450b2c3ea286bd.tar.gz gcc-3298fd35f7da7f77a0c2b8574f450b2c3ea286bd.tar.bz2 | |
2004-02-06 Michael Koch <konqueror@gmx.de>
* java/io/ObjectInputStream.java
(currentClassLoader): Reverted to old version of this method.
From-SVN: r77397
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/io/ObjectInputStream.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index d0def09..e471b6d 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 { |