Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.61
diff -u -r1.61 ObjectInputStream.java
--- java/io/ObjectInputStream.java	7 Aug 2005 12:25:10 -0000	1.61
+++ java/io/ObjectInputStream.java	13 Aug 2005 17:55:37 -0000
@@ -501,8 +501,7 @@
 						  flags, fields);
     assignNewHandle(osc);
 
-    if (callersClassLoader == null)
-      callersClassLoader = currentLoader();
+    ClassLoader callersClassLoader = currentLoader();
 	      
     for (int i = 0; i < field_count; i++)
       {
@@ -741,16 +740,34 @@
   protected Class resolveClass(ObjectStreamClass osc)
     throws ClassNotFoundException, IOException
   {
-    if (callersClassLoader == null)
+    String name = osc.getName();
+    try
       {
-	callersClassLoader = currentLoader ();
-	if (DEBUG && dump)
-	  {
-	    dumpElementln ("CallersClassLoader = " + callersClassLoader);
-	  }
+        return Class.forName(name, true, currentLoader());
+      }
+    catch(ClassNotFoundException x)
+      {
+        if (name.equals("void"))
+          return Void.TYPE;
+        else if (name.equals("boolean"))
+          return Boolean.TYPE;
+        else if (name.equals("byte"))
+          return Byte.TYPE;
+        else if (name.equals("char"))
+          return Character.TYPE;
+        else if (name.equals("short"))
+          return Short.TYPE;
+        else if (name.equals("int"))
+          return Integer.TYPE;
+        else if (name.equals("long"))
+          return Long.TYPE;
+        else if (name.equals("float"))
+          return Float.TYPE;
+        else if (name.equals("double"))
+          return Double.TYPE;
+        else
+          throw x;
       }
-
-    return Class.forName(osc.getName(), true, callersClassLoader);
   }
 
   /**
@@ -1871,7 +1888,6 @@
   private Hashtable classLookupTable;
   private GetField prereadFields;
 
-  private ClassLoader callersClassLoader;
   private static boolean dump;
 
   // The nesting depth for debugging output