- Append chars when possible, and avoid any String concatination.

- Made arrayStr static, soften the Exception thrown.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2893 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
ray.j.greenwell
2010-09-21 23:00:07 +00:00
parent 48951845b3
commit f12cf8a04e
@@ -63,12 +63,12 @@ public class LogBuilder
_log.append('['); _log.append('[');
_hasArgs = true; _hasArgs = true;
} }
_log.append(args[ii]).append("="); _log.append(args[ii]).append('=');
try { try {
Object arg = args[ii + 1]; Object arg = args[ii + 1];
_log.append(((arg == null) || !arg.getClass().isArray()) ? arg : arrayStr(arg)); _log.append(((arg == null) || !arg.getClass().isArray()) ? arg : arrayStr(arg));
} catch (Throwable t) { } catch (Throwable t) {
_log.append("<toString() failure: " + t + ">"); _log.append("<toString() failure: ").append(t).append('>');
} }
} }
} }
@@ -94,7 +94,7 @@ public class LogBuilder
/** /**
* Return the String representation of the specified Object, which must be an array. * Return the String representation of the specified Object, which must be an array.
*/ */
protected String arrayStr (Object arg) protected static String arrayStr (Object arg)
{ {
if (arg instanceof Object[]) { if (arg instanceof Object[]) {
return Arrays.deepToString((Object[])arg); // go deep, baby return Arrays.deepToString((Object[])arg); // go deep, baby
@@ -123,7 +123,7 @@ public class LogBuilder
} else if (arg instanceof boolean[]) { } else if (arg instanceof boolean[]) {
return Arrays.toString((boolean[])arg); return Arrays.toString((boolean[])arg);
} }
throw new AssertionError("Not an array: " + arg); throw new IllegalArgumentException("Not an array: " + arg);
} }
protected boolean _hasArgs; protected boolean _hasArgs;