From 5c12b59bd81874f851587c08a83dd7932ebf9114 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Thu, 26 Apr 2007 14:31:29 +0000 Subject: ObjectStreamClass.java (ensureFieldsSet): New method. 2007-04-25 Andrew Haley * 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 --- libjava/java/io/ObjectStreamClass.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libjava/java/io') diff --git a/libjava/java/io/ObjectStreamClass.h b/libjava/java/io/ObjectStreamClass.h index 7638f7b..3451453 100644 --- a/libjava/java/io/ObjectStreamClass.h +++ b/libjava/java/io/ObjectStreamClass.h @@ -57,6 +57,9 @@ private: void cacheMethods(); ObjectStreamClass(::java::lang::Class *); void setFlags(::java::lang::Class *); +public: // actually package-private + virtual void ensureFieldsSet(::java::lang::Class *); +private: void setFields(::java::lang::Class *); jlong getClassUID(::java::lang::Class *); public: // actually package-private @@ -105,6 +108,7 @@ private: public: // actually package-private jboolean isProxyClass; private: + jboolean fieldsSet; static const jlong serialVersionUID = -6120832682080437368LL; public: static ::java::lang::Class class$; -- cgit v1.1