2005-02-21 Bryce McKinlay <mckinlay@redhat.com>

	* java/io/ObjectInputStream.java (readClassDescriptor): Cache result
	of currentLoader() in callersClassLoader field. Check for primitive
	type Class names if resolveClass throws a ClassNotFoundException.
	(resolveClass): Call currentLoader() only if callersClassLoader is
	not set. Cache result of currentLoader(). Don't check for primitive
	type Class names here.
	(callersClassLoader): New field.
	* java/io/ObjectOutputStream.java (writeObject, callWriteMethod):
	Whitespace fixes.

1 files changed, 3 insertions, 3 deletions

diff --git a/java/io/ObjectOutputStream.java b/java/io/ObjectOutputStream.java
index 6dd3fe9f3..55763eedd 100644
--- a/java/io/ObjectOutputStream.java
+++ b/java/io/ObjectOutputStream.java
@@ -352,8 +352,8 @@ public class ObjectOutputStream extends OutputStream
 		      {
 			if (dump)
 			  dumpElementln ("WRITE FIELDS CALLED FOR: " + obj);
-		      writeFields(obj, currentObjectStreamClass);
-		  }
+			writeFields(obj, currentObjectStreamClass);
+		      }
 		  }
 
 		this.currentObject = prevObject;
@@ -1268,7 +1268,7 @@ public class ObjectOutputStream extends OutputStream
 	if (exception instanceof IOException)
 	  throw (IOException) exception;
 
-        IOException ioe
+	IOException ioe
 	  = new IOException("Exception thrown from writeObject() on " +
 			    osc.forClass().getName() + ": " +
                             exception.getClass().getName());