Index: java/io/ObjectOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectOutputStream.java,v
retrieving revision 1.46
diff -u -r1.46 ObjectOutputStream.java
--- java/io/ObjectOutputStream.java	23 Jul 2004 22:29:01 -0000	1.46
+++ java/io/ObjectOutputStream.java	24 Sep 2004 09:57:13 -0000
@@ -334,6 +334,8 @@
 
 	    if (obj instanceof Serializable)
 	      {
+		Object prevObject = this.currentObject;
+		ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass;
 		currentObject = obj;
 		ObjectStreamClass[] hierarchy =
 		  ObjectStreamClass.getObjectStreamClasses(clazz);
@@ -362,8 +364,8 @@
 		  }
 		  }
 
-		currentObject = null;
-		currentObjectStreamClass = null;
+		this.currentObject = prevObject;
+		this.currentObjectStreamClass = prevObjectStreamClass;
 		currentPutField = null;
 		break;
 	      }