diff options
| author | Andrew Haley <aph@gcc.gnu.org> | 2007-04-26 14:31:29 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-04-26 14:31:29 +0000 |
| commit | 5c12b59bd81874f851587c08a83dd7932ebf9114 (patch) | |
| tree | 5adf7762dc6581c91705a6569ffe2b0e7aa990f5 /libjava/classpath/java/io/ObjectInputStream.java | |
| parent | 02cba8dfe4e337517390a0763b3248ea1216b52b (diff) | |
ObjectStreamClass.java (ensureFieldsSet): New method.
2007-04-25 Andrew Haley <aph@redhat.com>
* java/io/ObjectStreamClass.java (ensureFieldsSet): New method.
(setFields): call ensureFieldsSet.
(fieldsSet): New field.
* java/io/ObjectOutputStream.java (writeFields): Call
osc.ensureFieldsSet().
* java/io/ObjectInputStream.java (parseContent): Assign the handle
for a PROXYCLASSDESC immediately after reading the marker.
From-SVN: r124187
Diffstat (limited to 'libjava/classpath/java/io/ObjectInputStream.java')
| -rw-r--r-- | libjava/classpath/java/io/ObjectInputStream.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libjava/classpath/java/io/ObjectInputStream.java b/libjava/classpath/java/io/ObjectInputStream.java index e469609bde0..735d46cd920 100644 --- a/libjava/classpath/java/io/ObjectInputStream.java +++ b/libjava/classpath/java/io/ObjectInputStream.java @@ -223,6 +223,15 @@ public class ObjectInputStream extends InputStream case TC_PROXYCLASSDESC: { if(dump) dumpElementln("PROXYCLASS"); + +/* GCJ LOCAL */ + // The grammar at this point is + // TC_PROXYCLASSDESC newHandle proxyClassDescInfo + // i.e. we have to assign the handle immediately after + // reading the marker. + int handle = assignNewHandle("Dummy proxy"); +/* END GCJ LOCAL */ + int n_intf = this.realInputStream.readInt(); String[] intfs = new String[n_intf]; for (int i = 0; i < n_intf; i++) @@ -250,7 +259,9 @@ public class ObjectInputStream extends InputStream new InternalError("Object ctor missing").initCause(x); } } - assignNewHandle(osc); +/* GCJ LOCAL */ + rememberHandle(osc,handle); +/* END GCJ LOCAL */ if (!is_consumed) { |