[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fixes for synchronization

[Kaffe CVS]

PatchSet 5227 
Date: 2004/09/28 18:37:50
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fixes for synchronization

2004-09-28  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/io/ObjectInputStream.java:
        Resynced with GNU Classpath.

        2004-09-24  Andrew Haley  <aph at redhat.com>

        * java/io/ObjectInputStream.java
        (readObject): Save and restore this.currentObject and
        this.currentObjectStreamClass around calls to callReadMethod().

        2004-09-24  Andrew Haley  <aph at redhat.com>

        * java/io/ObjectInputStream.java
        (readObject): Save and restore this.currentObject and
        this.currentObjectStreamClass around calls to callReadMethod().

Members: 
	ChangeLog:1.2781->1.2782 
	libraries/javalib/java/io/ObjectInputStream.java:1.40->1.41 
	libraries/javalib/java/io/ObjectOutputStream.java:1.22->1.23 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2781 kaffe/ChangeLog:1.2782
--- kaffe/ChangeLog:1.2781	Tue Sep 28 16:26:20 2004
+++ kaffe/ChangeLog	Tue Sep 28 18:37:50 2004
@@ -5,6 +5,23 @@
 
 2004-09-28  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/ObjectInputStream.java:
+	Resynced with GNU Classpath.
+
+	2004-09-24  Andrew Haley  <aph at redhat.com>
+
+	* java/io/ObjectInputStream.java
+	(readObject): Save and restore this.currentObject and
+	this.currentObjectStreamClass around calls to callReadMethod().
+	
+	2004-09-24  Andrew Haley  <aph at redhat.com>
+
+	* java/io/ObjectInputStream.java
+	(readObject): Save and restore this.currentObject and
+	this.currentObjectStreamClass around calls to callReadMethod().
+
+2004-09-28  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/net/URL.java:
 	Resynced with GNU Classpath.
 	
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.40 kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.41
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.40	Sun Sep 12 15:11:02 2004
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java	Tue Sep 28 18:37:52 2004
@@ -51,7 +51,6 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
-
 public class ObjectInputStream extends InputStream
   implements ObjectInput, ObjectStreamConstants
 {
@@ -300,6 +299,9 @@
 	      Object obj = newObject(clazz, osc.firstNonSerializableParent);
 	      
 	      int handle = assignNewHandle(obj);
+	      Object prevObject = this.currentObject;
+	      ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass;
+	      
 	      this.currentObject = obj;
 	      ObjectStreamClass[] hierarchy =
 		inputGetObjectStreamClasses(clazz);
@@ -347,8 +349,8 @@
 		    }
 		}
 
-	      this.currentObject = null;
-	      this.currentObjectStreamClass = null;
+	      this.currentObject = prevObject;
+	      this.currentObjectStreamClass = prevObjectStreamClass;
 	      ret_val = processResolution(osc, obj, handle);
 		  
 	      break;
Index: kaffe/libraries/javalib/java/io/ObjectOutputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.22 kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.23
--- kaffe/libraries/javalib/java/io/ObjectOutputStream.java:1.22	Mon Jul 26 21:13:56 2004
+++ kaffe/libraries/javalib/java/io/ObjectOutputStream.java	Tue Sep 28 18:37:53 2004
@@ -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;
 	      }