git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ObjectInputStream.java: (parseContent): Call (String, Object) version of dumpElementln. 

2007-04-16  Andrew Haley  <aph@redhat.com>

        * java/io/ObjectInputStream.java: (parseContent):  Call (String,
        Object) version of dumpElementln.
        (dumpElementln(String, Object)): New method.
        * java/io/ObjectOutputStream.java (writeObject): Call (String,
        Object) version of dumpElementln.
        (dumpElementln(String, Object)): New method.

From-SVN: r123875
This commit is contained in:
Andrew Haley 2007-04-16 15:29:55 +00:00 committed by Andrew Haley
parent bdbf40a536
commit 8734935bf8
3 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/classpath/ChangeLog
View File

@ -1,3 +1,12 @@
2007-04-16 Andrew Haley <aph@redhat.com>
* java/io/ObjectInputStream.java: (parseContent): Call (String,
Object) version of dumpElementln.
(dumpElementln(String, Object)): New method.
* java/io/ObjectOutputStream.java (writeObject): Call (String,
Object) version of dumpElementln.
(dumpElementln(String, Object)): New method.
2007-04-16 Andrew John Hughes <gnu_andrew@member.fsf.org> 2007-04-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/ObjectName.java: * javax/management/ObjectName.java:

20
libjava/classpath/java/io/ObjectInputStream.java
View File

@ -307,7 +307,7 @@ public class ObjectInputStream extends InputStream
readArrayElements(array, componentType); readArrayElements(array, componentType);
if(dump) if(dump)
for (int i = 0, len = Array.getLength(array); i < len; i++) for (int i = 0, len = Array.getLength(array); i < len; i++)
dumpElementln(" ELEMENT[" + i + "]=" + Array.get(array, i)); dumpElementln(" ELEMENT[" + i + "]=", Array.get(array, i));
ret_val = processResolution(null, array, handle); ret_val = processResolution(null, array, handle);
break; break;
} }
@ -1984,6 +1984,24 @@ public class ObjectInputStream extends InputStream
System.out.print (Thread.currentThread() + ": "); System.out.print (Thread.currentThread() + ": ");
} }
private void dumpElementln (String msg, Object obj)
{
try
{
System.out.print(msg);
if (java.lang.reflect.Proxy.isProxyClass(obj.getClass()))
System.out.println(obj.getClass());
else
System.out.println(obj);
}
catch (Exception _)
{
}
for (int i = 0; i < depth; i++)
System.out.print (" ");
System.out.print (Thread.currentThread() + ": ");
}
// used to keep a prioritized list of object validators // used to keep a prioritized list of object validators
private static final class ValidatorAndPriority implements Comparable private static final class ValidatorAndPriority implements Comparable
{ {

32
libjava/classpath/java/io/ObjectOutputStream.java
View File

@ -191,7 +191,7 @@ public class ObjectOutputStream extends OutputStream
} }
if (dump) if (dump)
dumpElementln ("WRITE: " + obj); dumpElementln ("WRITE: ", obj);
depth += 2; depth += 2;
@ -352,18 +352,18 @@ public class ObjectOutputStream extends OutputStream
if (currentObjectStreamClass.hasWriteMethod()) if (currentObjectStreamClass.hasWriteMethod())
{ {
if (dump) if (dump)
dumpElementln ("WRITE METHOD CALLED FOR: " + obj); dumpElementln ("WRITE METHOD CALLED FOR: ", obj);
setBlockDataMode(true); setBlockDataMode(true);
callWriteMethod(obj, currentObjectStreamClass); callWriteMethod(obj, currentObjectStreamClass);
setBlockDataMode(false); setBlockDataMode(false);
realOutput.writeByte(TC_ENDBLOCKDATA); realOutput.writeByte(TC_ENDBLOCKDATA);
if (dump) if (dump)
dumpElementln ("WRITE ENDBLOCKDATA FOR: " + obj); dumpElementln ("WRITE ENDBLOCKDATA FOR: ", obj);
} }
else else
{ {
if (dump) if (dump)
dumpElementln ("WRITE FIELDS CALLED FOR: " + obj); dumpElementln ("WRITE FIELDS CALLED FOR: ", obj);
writeFields(obj, currentObjectStreamClass); writeFields(obj, currentObjectStreamClass);
} }
} }
@ -420,7 +420,7 @@ public class ObjectOutputStream extends OutputStream
depth -= 2; depth -= 2;
if (dump) if (dump)
dumpElementln ("END: " + obj); dumpElementln ("END: ", obj);
} }
} }
@ -1340,6 +1340,28 @@ public class ObjectOutputStream extends OutputStream
} }
} }
private void dumpElementln (String msg, Object obj)
{
try
{
for (int i = 0; i < depth; i++)
System.out.print (" ");
System.out.print (Thread.currentThread() + ": ");
System.out.print (msg);
if (java.lang.reflect.Proxy.isProxyClass(obj.getClass()))
System.out.print (obj.getClass());
else
System.out.print (obj);
}
catch (Exception _)
{
}
finally
{
System.out.println ();
}
}
private void dumpElementln (String msg) private void dumpElementln (String msg)
{ {
for (int i = 0; i < depth; i++) for (int i = 0; i < depth; i++)