ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 12:48:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix various ObjectOutputStream/ObjectInputStream bugs

Browse Source
This commit is contained in:
Anonymous
2011-07-01 08:43:43 -06:00
committed by Joel Dice
parent 9700b7def1
commit 794a45cb79
11 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
classpath/java/io/ObjectOutputStream.java
View File

@ -39,7 +39,7 @@ public class ObjectOutputStream extends OutputStream {
}
public void writeObject(Object o) throws IOException {
writeObject(o, new IdentityHashMap(), 0);
writeObject(o, new IdentityHashMap(), new int[] {0});
}
public void writeBoolean(boolean v) {
@ -87,7 +87,7 @@ public class ObjectOutputStream extends OutputStream {
}
private void writeObject(Object o, IdentityHashMap<Object, Integer> map,
int nextId)
int[] nextId)
throws IOException
{
if (o == null) {
@ -95,7 +95,7 @@ public class ObjectOutputStream extends OutputStream {
} else {
Integer id = map.get(o);
if (id == null) {
map.put(o, nextId);
map.put(o, nextId[0]);
Class c = o.getClass();
if (c.isArray()) {
@ -113,7 +113,7 @@ public class ObjectOutputStream extends OutputStream {
}
private void serializeArray(Object o, IdentityHashMap<Object, Integer> map,
int nextId)
int[] nextId)
throws IOException
{
Class c = o.getClass();
@ -121,7 +121,7 @@ public class ObjectOutputStream extends OutputStream {
int length = Array.getLength(o);
out.print("a(");
out.print(nextId++);
out.print(nextId[0]++);
out.print(" ");
out.print(c.getName());
out.print(" ");
@ -155,17 +155,17 @@ public class ObjectOutputStream extends OutputStream {
}
private void serializeObject(Object o, IdentityHashMap<Object, Integer> map,
int nextId)
int[] nextId)
throws IOException
{
Class c = o.getClass();
out.print("l(");
out.print(nextId++);
out.print(nextId[0]++);
out.print(" ");
out.print(c.getName());
for (Field f: c.getFields()) {
for (Field f: c.getAllFields()) {
int modifiers = f.getModifiers();
if ((modifiers & (Modifier.TRANSIENT | Modifier.STATIC)) == 0) {
out.print(" ");