From cb82f080d6139513e7fbf246c56d2aca16c56fea Mon Sep 17 00:00:00 2001
From: "ray.j.greenwell" <ray.j.greenwell@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 15 Dec 2010 01:57:47 +0000
Subject: [PATCH] Added ArrayUtil.safeToString(), which encapsulates the logic
 to check if it's an array.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2970 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/main/java/com/samskivert/util/ArrayUtil.java  | 10 +++++++++-
 src/main/java/com/samskivert/util/LogBuilder.java |  4 +---
 src/main/java/com/samskivert/util/Logger.java     |  5 +----
 3 files changed, 11 insertions(+), 8 deletions(-)

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 <em>must</em> 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("<toString() failure: ").append(t).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("<toString() failure: ").append(t).append(">");
                 }