* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123875
138bc75d-0d04-0410-961f-
82ee72b054a4
+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>
* javax/management/ObjectName.java:
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;
}
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
{
}
if (dump)
- dumpElementln ("WRITE: " + obj);
+ dumpElementln ("WRITE: ", obj);
depth += 2;
if (currentObjectStreamClass.hasWriteMethod())
{
if (dump)
- dumpElementln ("WRITE METHOD CALLED FOR: " + obj);
+ dumpElementln ("WRITE METHOD CALLED FOR: ", obj);
setBlockDataMode(true);
callWriteMethod(obj, currentObjectStreamClass);
setBlockDataMode(false);
realOutput.writeByte(TC_ENDBLOCKDATA);
if (dump)
- dumpElementln ("WRITE ENDBLOCKDATA FOR: " + obj);
+ dumpElementln ("WRITE ENDBLOCKDATA FOR: ", obj);
}
else
{
if (dump)
- dumpElementln ("WRITE FIELDS CALLED FOR: " + obj);
+ dumpElementln ("WRITE FIELDS CALLED FOR: ", obj);
writeFields(obj, currentObjectStreamClass);
}
}
depth -= 2;
if (dump)
- dumpElementln ("END: " + obj);
+ dumpElementln ("END: ", obj);
}
}
}
}
+ 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)
{
for (int i = 0; i < depth; i++)