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

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

From-SVN: r77397

libjava/ChangeLog

+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

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
   {