Fixes possible NPE

stleary · Oct 12, 2015 · ceba8e8 · ceba8e8
1 parent b0191a6
commit ceba8e8
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/XML.java b/XML.java
@@ -468,23 +468,25 @@ public static String toString(Object object, String tagName)
 // XML does not have good support for arrays. If an array appears in a place
 // where XML is lacking, synthesize an <array> element.
 
-        } else {
+        }
+        if(object!=null){
             if (object.getClass().isArray()) {
                 object = new JSONArray(object);
             }
+
             if (object instanceof JSONArray) {
                 ja = (JSONArray)object;
                 length = ja.length();
                 for (i = 0; i < length; i += 1) {
                     sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
                 }
                 return sb.toString();
-            } else {
-                string = (object == null) ? "null" : escape(object.toString());
-                return (tagName == null) ? "\"" + string + "\"" :
-                    (string.length() == 0) ? "<" + tagName + "/>" :
-                    "<" + tagName + ">" + string + "</" + tagName + ">";
             }
         }
+        string = (object == null) ? "null" : escape(object.toString());
+        return (tagName == null) ? "\"" + string + "\"" :
+            (string.length() == 0) ? "<" + tagName + "/>" :
+            "<" + tagName + ">" + string + "</" + tagName + ">";
+
     }
 }