FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ObjectStreamClass.java (ensureFieldsSet): New method.

Browse source 
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
This commit is contained in:
Andrew Haley 2007-04-26 14:31:29 +00:00
parent 02cba8dfe4
commit 5c12b59bd8
15 changed files with 46 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libjava/classpath/java/io/ObjectStreamClass.java
View file

@ -654,11 +654,29 @@ outer:
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())
@ -1094,6 +1112,11 @@ outer:
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;