* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124187
138bc75d-0d04-0410-961f-
82ee72b054a4
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++)
new InternalError("Object ctor missing").initCause(x);
}
}
- assignNewHandle(osc);
+/* GCJ LOCAL */
+ rememberHandle(osc,handle);
+/* END GCJ LOCAL */
if (!is_consumed)
{
}
+/* GCJ LOCAL */
// writes out FIELDS of OBJECT for the specified ObjectStreamClass.
- // FIELDS are already in canonical order.
+ // FIELDS are already supposed already to be in canonical order, but
+ // under some circumstances (to do with Proxies) this isn't the
+ // case, so we call ensureFieldsSet().
private void writeFields(Object obj, ObjectStreamClass osc)
throws IOException
{
+ osc.ensureFieldsSet(osc.forClass());
+/* END GCJ LOCAL */
+
ObjectStreamField[] fields = osc.fields;
boolean oldmode = setBlockDataMode(false);
flags |= ObjectStreamConstants.SC_ENUM;
}
+/* GCJ LOCAL */
+ // FIXME: This is a workaround for a fairly obscure bug that happens
+ // when reading a Proxy and then writing it back out again. The
+ // result is that the ObjectStreamClass doesn't have its fields set,
+ // generating a NullPointerException. Rather than this kludge we
+ // should probably fix the real bug, but it would require a fairly
+ // radical reorganization to do so.
+ final void ensureFieldsSet(Class cl)
+ {
+ if (! fieldsSet)
+ setFields(cl);
+ }
+/* END GCJ LOCAL */
+
// Sets fields to be a sorted array of the serializable fields of
// clazz.
private void setFields(Class cl)
{
+/* GCJ LOCAL */
+ fieldsSet = true;
+/* END GCJ LOCAL */
+
SetAccessibleAction setAccessible = new SetAccessibleAction();
if (!isSerializable() || isExternalizable() || isEnum())
boolean isProxyClass = false;
+/* GCJ LOCAL */
+ // True after setFields() has been called
+ private boolean fieldsSet = false;
+/* END GCJ LOCAL */
+
// This is probably not necessary because this class is special cased already
// but it will avoid showing up as a discrepancy when comparing SUIDs.
private static final long serialVersionUID = -6120832682080437368L;
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
public: // actually package-private
jboolean isProxyClass;
private:
+ jboolean fieldsSet;
static const jlong serialVersionUID = -6120832682080437368LL;
public:
static ::java::lang::Class class$;