svn commit: r1302394 - /karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java

[cschneider]

Author: cschneider
Date: Mon Mar 19 12:17:12 2012
New Revision: 1302394

URL: http://svn.apache.org/viewvc?rev=1302394&view=rev
Log:
Fix problem if obj is null

Modified:
    karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java

Modified: karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java?rev=1302394&r1=1302393&r2=1302394&view=diff
==============================================================================
--- karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java 
(original)
+++ karaf/trunk/util/src/main/java/org/apache/karaf/util/ShellUtil.java Mon Mar 
19 12:17:12 2012
@@ -59,7 +59,10 @@ public class ShellUtil {
 
     public static String getValueString(Object obj)
     {
-        if (obj.getClass().isArray())
+        if (obj == null) {
+            return "null";
+        } 
+        else if (obj.getClass().isArray())
         {
             Object[] array = (Object[]) obj;
             StringBuilder sb = new StringBuilder();
@@ -116,10 +119,6 @@ public class ShellUtil {
                 return obj.toString();
             }
         }
-        else if (obj == null)
-        {
-            return "null";
-        }
         else
         {
             return obj.toString();