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

[Kaffe CVS]

PatchSet 5418 
Date: 2004/11/07 20:24:31
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: serialization fixes

2004-11-07  Dalibor Topic  <robilad at kaffe.org>

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

        2004-11-06  Andrew Haley  <aph at redhat.com>

        * java/io/ObjectInputStream.java
        (readObject): ENDBLOCKDATA is generated if the class has a write
        method, not if it has a read method.

        2004-11-06  Mark Wielaard  <mark at klomp.org>

        * java/util/Vector.java (readObject): Removed.

Members: 
	ChangeLog:1.2967->1.2968 
	libraries/javalib/java/io/ObjectInputStream.java:1.42->1.43 
	libraries/javalib/java/util/Vector.java:1.28->1.29 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2967 kaffe/ChangeLog:1.2968
--- kaffe/ChangeLog:1.2967	Sun Nov  7 19:55:04 2004
+++ kaffe/ChangeLog	Sun Nov  7 20:24:31 2004
@@ -1,5 +1,21 @@
 2004-11-07  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/io/ObjectInputStream.java,
+	libraries/javalib/java/util/Vector.java:
+	Resynced with GNU Classpath.
+
+	2004-11-06  Andrew Haley  <aph at redhat.com>
+
+	* java/io/ObjectInputStream.java
+	(readObject): ENDBLOCKDATA is generated if the class has a write
+	method, not if it has a read method.
+
+	2004-11-06  Mark Wielaard  <mark at klomp.org>
+
+	* java/util/Vector.java (readObject): Removed.
+
+2004-11-07  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/net/protocol/http/Connection.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.42 kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.43
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.42	Tue Oct 12 00:07:48 2004
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java	Sun Nov  7 20:24:34 2004
@@ -324,6 +324,14 @@
 		      boolean oldmode = setBlockDataMode(true);
 		      callReadMethod(readObjectMethod, this.currentObjectStreamClass.forClass(), obj);
 		      setBlockDataMode(oldmode);
+		    }
+		  else
+		    {
+		      readFields(obj, currentObjectStreamClass);
+		    }
+
+		  if (this.currentObjectStreamClass.hasWriteMethod())
+		    {
 		      if(dump) dumpElement("ENDBLOCKDATA? ");
 		      try
 			{
@@ -345,10 +353,6 @@
 			{
 			  if(dump) dumpElementln("no, got IOException");
 			}
-		    }
-		  else
-		    {
-		      readFields(obj, currentObjectStreamClass);
 		    }
 		}
 
Index: kaffe/libraries/javalib/java/util/Vector.java
diff -u kaffe/libraries/javalib/java/util/Vector.java:1.28 kaffe/libraries/javalib/java/util/Vector.java:1.29
--- kaffe/libraries/javalib/java/util/Vector.java:1.28	Wed Nov  3 17:45:17 2004
+++ kaffe/libraries/javalib/java/util/Vector.java	Sun Nov  7 20:24:34 2004
@@ -929,18 +929,4 @@
     s.defaultWriteObject();
   }
 
-  /**
-   * Deserializes this object from the given stream.
-   *
-   * @param s the stream to read from
-   * @throws ClassNotFoundException if the underlying stream fails
-   * @throws IOException if the underlying stream fails
-   * @serialData just calls default read function
-   */
-  private void readObject(ObjectInputStream s)
-    throws IOException, ClassNotFoundException
-  {
-    s.defaultReadObject();
-  }
-
 }