2004-02-06 Michael Koch <konqueror@gmx.de>

	* java/io/ObjectInputStream.java
	(currentClassLoader): Reverted to old version of this method.

From-SVN: r77397

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 204cd71641308129e3955ec16593c368ed51fdcb..69795b95001ea16f789bc3a3f9ea725590fc1395 100644 (file)
--- 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 d0def09181c98cef9bb875fa6e6ede8afadbdb5e..e471b6d7d59b4cdef22bd54f8ce27bf8c16188d7 100644 (file)
--- 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
   {