ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ObjectInputStream: use private readObject() methods

Browse Source 
The specification of the Java deserialization demands that a private
readObject(ObjectOutputStream) method is used -- if it exists. In
that case, ObjectInputStream must not initialize the contents of the
fields (called 'classdata[]' in the documentation) but offer that
functionality via the defaultReadObject() method.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2013-10-30 12:46:35 -05:00
parent 931617a787
commit 25ed2965e7
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
classpath/java/io/ObjectInputStream.java
View File

@ -32,12 +32,14 @@ import static java.io.ObjectOutputStream.SC_BLOCK_DATA;
import static java.io.ObjectOutputStream.SC_SERIALIZABLE; import static java.io.ObjectOutputStream.SC_SERIALIZABLE;
import static java.io.ObjectOutputStream.SC_EXTERNALIZABLE; import static java.io.ObjectOutputStream.SC_EXTERNALIZABLE;
import static java.io.ObjectOutputStream.SC_ENUM; import static java.io.ObjectOutputStream.SC_ENUM;
import static java.io.ObjectOutputStream.getReadOrWriteMethod;
import avian.VMClass; import avian.VMClass;
import java.util.HashMap; import java.util.HashMap;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
public class ObjectInputStream extends InputStream implements DataInput { public class ObjectInputStream extends InputStream implements DataInput {
@ -310,7 +312,7 @@ public class ObjectInputStream extends InputStream implements DataInput {
} catch (Exception ignored) { } } catch (Exception ignored) { }
int flags = rawByte(); int flags = rawByte();
if (flags != SC_SERIALIZABLE) { if ((flags & ~(SC_SERIALIZABLE | SC_WRITE_METHOD)) != 0) {
throw new UnsupportedOperationException("Cannot handle flags: 0x" throw new UnsupportedOperationException("Cannot handle flags: 0x"
+ Integer.toHexString(flags)); + Integer.toHexString(flags));
} }
@ -344,8 +346,22 @@ public class ObjectInputStream extends InputStream implements DataInput {
try { try {
Object o = makeInstance(clazz.vmClass); Object o = makeInstance(clazz.vmClass);
for (Field field : fields) { boolean customized = (flags & SC_WRITE_METHOD) != 0;
field(field, o); Method readMethod = customized ?
getReadOrWriteMethod(o, "readObject") : null;
if (readMethod == null) {
if (customized) {
throw new IOException("Could not find required readObject method in "
+ clazz);
}
defaultReadObject(o, fields);
} else {
current = o;
currentFields = fields;
readMethod.invoke(o, this);
current = null;
currentFields = null;
expectToken(TC_ENDBLOCKDATA);
} }
return o; return o;
@ -356,8 +372,23 @@ public class ObjectInputStream extends InputStream implements DataInput {
} }
} }
private Object current;
private Field[] currentFields;
public void defaultReadObject() throws IOException { public void defaultReadObject() throws IOException {
throw new UnsupportedOperationException(); defaultReadObject(current, currentFields);
}
private void defaultReadObject(Object o, Field[] fields) throws IOException {
try {
for (Field field : fields) {
field(field, o);
}
} catch (IOException e) {
throw e;
} catch (Exception e) {
throw new IOException(e);
}
} }
private static native Object makeInstance(VMClass c); private static native Object makeInstance(VMClass c);