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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -307,7 +307,7 @@ public class ObjectInputStream extends InputStream
readArrayElements(array, componentType);
if(dump)
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);
break;
}
@ -1984,6 +1984,24 @@ public class ObjectInputStream extends InputStream
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
private static final class ValidatorAndPriority implements Comparable
{