diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-07-22 09:00:25 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2004-07-22 09:00:25 +0000 |
| commit | 9bba738a2f169b6e51a3eb8625492a16664ad6af (patch) | |
| tree | a6e67e7b14d5ce1c5b6b7e461de6a5b64006cc13 /java/io/ObjectInputStream.java | |
| parent | 37b3c9294b72c7858ce42a708b6c6b1deb40369f (diff) | |
| download | classpath-9bba738a2f169b6e51a3eb8625492a16664ad6af.tar.gz | |
2004-07-22 Michael Koch <konqueror@gmx.de>
* java/io/ObjectInputStream.java:
Merge debug code with libgcj.
(depth): New field.
* java/io/ObjectOutputStream.java
(writeObject): Revert not intended change in my last commit.
Diffstat (limited to 'java/io/ObjectInputStream.java')
| -rw-r--r-- | java/io/ObjectInputStream.java | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/java/io/ObjectInputStream.java b/java/io/ObjectInputStream.java index 6ad245210..ca7fe35ef 100644 --- a/java/io/ObjectInputStream.java +++ b/java/io/ObjectInputStream.java @@ -134,6 +134,9 @@ public class ObjectInputStream extends InputStream this.isDeserializing = true; byte marker = this.realInputStream.readByte(); + + depth += 2; + if(dump) dumpElement("MARKER: 0x" + Integer.toHexString(marker) + " "); try @@ -151,9 +154,9 @@ public class ObjectInputStream extends InputStream case TC_BLOCKDATALONG: { if (marker == TC_BLOCKDATALONG) - if(dump) dumpElementln("BLOCKDATALONG"); + { if(dump) dumpElementln("BLOCKDATALONG"); } else - if(dump) dumpElementln("BLOCKDATA"); + { if(dump) dumpElementln("BLOCKDATA"); } readNextBlock(marker); throw new StreamCorruptedException("Unexpected blockData"); } @@ -329,10 +332,10 @@ public class ObjectInputStream extends InputStream ("No end of block data seen for class with readObject (ObjectInputStream) method."); if(dump) dumpElementln("yes"); } - catch (EOFException e) - { - if(dump) dumpElementln("no, got EOFException"); - } +// catch (EOFException e) +// { +// if(dump) dumpElementln("no, got EOFException"); +// } catch (IOException e) { if(dump) dumpElementln("no, got IOException"); @@ -347,6 +350,7 @@ public class ObjectInputStream extends InputStream this.currentObject = null; this.currentObjectStreamClass = null; ret_val = processResolution(osc, obj, handle); + break; } @@ -375,6 +379,8 @@ public class ObjectInputStream extends InputStream this.isDeserializing = was_deserializing; + depth -= 2; + if (! was_deserializing) { if (validators.size() > 0) @@ -1838,6 +1844,9 @@ public class ObjectInputStream extends InputStream private static boolean dump = false && Configuration.DEBUG; + // The nesting depth for debugging output + private int depth = 0; + private void dumpElement (String msg) { System.out.print(msg); @@ -1846,6 +1855,9 @@ public class ObjectInputStream extends InputStream private void dumpElementln (String msg) { System.out.println(msg); + for (int i = 0; i < depth; i++) + System.out.print (" "); + System.out.print (Thread.currentThread() + ": "); } static |