[kaffe] CVS kaffe (robilad): Fixed deserialization with fields in superclass

[Kaffe CVS]

PatchSet 5361 
Date: 2004/10/25 00:21:04
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed deserialization with fields in superclass

2004-10-24  Noa Resare  <noa at resare.com>

       * libraries/clib/io/ObjectInputStream.c:
       Update fields in superclasses as well in deserialization.

Members: 
	ChangeLog:1.2913->1.2914 
	libraries/clib/io/ObjectInputStream.c:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2913 kaffe/ChangeLog:1.2914
--- kaffe/ChangeLog:1.2913	Sun Oct 24 23:20:05 2004
+++ kaffe/ChangeLog	Mon Oct 25 00:21:04 2004
@@ -1,3 +1,8 @@
+2004-10-24  Noa Resare  <noa at resare.com>
+
+       * libraries/clib/io/ObjectInputStream.c:
+       Update fields in superclasses as well in deserialization.
+
 2004-10-24  Eric Anholt  <eta at lclark.edu>
 
 	* config/x86_64/common.h,
Index: kaffe/libraries/clib/io/ObjectInputStream.c
diff -u kaffe/libraries/clib/io/ObjectInputStream.c:1.4 kaffe/libraries/clib/io/ObjectInputStream.c:1.5
--- kaffe/libraries/clib/io/ObjectInputStream.c:1.4	Thu Jul  8 10:00:13 2004
+++ kaffe/libraries/clib/io/ObjectInputStream.c	Mon Oct 25 00:21:06 2004
@@ -90,7 +90,7 @@
 		SignalError ("java.lang.IllegalArgumentException", "");
 	}
 
-	return (void *)((uintp)obj + FIELD_BOFFSET(CLASS_FIELDS(OBJECT_CLASS(obj)) + unhand(sfield)->slot));
+	return (void *)((uintp)obj + FIELD_BOFFSET(CLASS_FIELDS(sfield->clazz) + unhand(sfield)->slot));
 }
 
 void java_io_VMObjectStreamClass_setBooleanNative