diff --git a/src/main/java/com/samskivert/util/ArrayUtil.java b/src/main/java/com/samskivert/util/ArrayUtil.java index e7bdd669..727441cf 100644 --- a/src/main/java/com/samskivert/util/ArrayUtil.java +++ b/src/main/java/com/samskivert/util/ArrayUtil.java @@ -908,7 +908,15 @@ public class ArrayUtil } /** - * Return the String representation of the specified Object, which must be an array. + * Return the String representation of the specified Object, which may or may not be an array. + */ + public static String safeToString (Object o) + { + return ((o == null) || !o.getClass().isArray()) ? String.valueOf(o) : toString(o); + } + + /** + * Return the String representation of the specified Object, which must be an array. * * @throws IllegalArgumentException if array is not actually an array. */ diff --git a/src/main/java/com/samskivert/util/LogBuilder.java b/src/main/java/com/samskivert/util/LogBuilder.java index 47ab0a38..ccf6da47 100644 --- a/src/main/java/com/samskivert/util/LogBuilder.java +++ b/src/main/java/com/samskivert/util/LogBuilder.java @@ -63,9 +63,7 @@ public class LogBuilder } _log.append(args[ii]).append('='); try { - Object arg = args[ii + 1]; - _log.append(((arg == null) || !arg.getClass().isArray()) - ? arg : ArrayUtil.toString(arg)); + _log.append(ArrayUtil.safeToString(args[ii + 1])); } catch (Throwable t) { _log.append("'); } diff --git a/src/main/java/com/samskivert/util/Logger.java b/src/main/java/com/samskivert/util/Logger.java index 8656c25c..e0675539 100644 --- a/src/main/java/com/samskivert/util/Logger.java +++ b/src/main/java/com/samskivert/util/Logger.java @@ -157,10 +157,7 @@ public abstract class Logger } buf.append(args[ii]).append('='); try { - Object arg = args[ii + 1]; - buf.append(((arg == null) || !arg.getClass().isArray()) - ? arg - : ArrayUtil.toString(arg)); + buf.append(ArrayUtil.safeToString(args[ii + 1])); } catch (Throwable t) { buf.append(""); }