PatchSet 5565
Date: 2004/12/08 16:51:52
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: seralization fix
2004-12-08 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/io/ObjectInputStream.java:
Resynced with GNU Classpath.
2004-12-07 Jeroen Frijters <[EMAIL PROTECTED]>
* java/io/ObjectInputStream.java
(readObject): Fix to consume TC_ENDBLOCKDATA after readExternal.
Members:
ChangeLog:1.3111->1.3112
libraries/javalib/java/io/ObjectInputStream.java:1.45->1.46
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3111 kaffe/ChangeLog:1.3112
--- kaffe/ChangeLog:1.3111 Wed Dec 8 08:05:14 2004
+++ kaffe/ChangeLog Wed Dec 8 16:51:52 2004
@@ -1,5 +1,15 @@
2004-12-08 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/java/io/ObjectInputStream.java:
+ Resynced with GNU Classpath.
+
+ 2004-12-07 Jeroen Frijters <[EMAIL PROTECTED]>
+
+ * java/io/ObjectInputStream.java
+ (readObject): Fix to consume TC_ENDBLOCKDATA after readExternal.
+
+2004-12-08 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/bootstrap.classlist:
Added missing classses to fix build with kjc.
Index: kaffe/libraries/javalib/java/io/ObjectInputStream.java
diff -u kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.45
kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.46
--- kaffe/libraries/javalib/java/io/ObjectInputStream.java:1.45 Mon Dec 6
17:39:57 2004
+++ kaffe/libraries/javalib/java/io/ObjectInputStream.java Wed Dec 8
16:51:55 2004
@@ -293,7 +293,12 @@
obj.readExternal(this);
if (read_from_blocks)
- setBlockDataMode(oldmode);
+ {
+ setBlockDataMode(oldmode);
+ if (!oldmode)
+ if (this.realInputStream.readByte() != TC_ENDBLOCKDATA)
+ throw new IOException("No end of block data seen
for class with readExternal (ObjectInputStream) method.");
+ }
ret_val = processResolution(osc, obj, handle);
break;
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
