Fixes possible NPE

John J. Aylward · John J. Aylward · commit ceba8e8c3dee · 2015-10-12T14:25:18.000-04:00
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 + ">";
+            
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -468,23 +468,25 @@ public static String toString(Object object, String tagName)`
`468`	`468`	`// XML does not have good support for arrays. If an array appears in a place`
`469`	`469`	`// where XML is lacking, synthesize an <array> element.`
`470`	`470`
`471`		`- } else {`
	`471`	`+ }`
	`472`	`+ if(object!=null){`
`472`	`473`	`if (object.getClass().isArray()) {`
`473`	`474`	`object = new JSONArray(object);`
`474`	`475`	`}`
	`476`	`+`
`475`	`477`	`if (object instanceof JSONArray) {`
`476`	`478`	`ja = (JSONArray)object;`
`477`	`479`	`length = ja.length();`
`478`	`480`	`for (i = 0; i < length; i += 1) {`
`479`	`481`	`sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));`
`480`	`482`	`}`
`481`	`483`	`return sb.toString();`
`482`		`- } else {`
`483`		`- string = (object == null) ? "null" : escape(object.toString());`
`484`		`- return (tagName == null) ? "\"" + string + "\"" :`
`485`		`- (string.length() == 0) ? "<" + tagName + "/>" :`
`486`		`- "<" + tagName + ">" + string + "</" + tagName + ">";`
`487`	`484`	`}`
`488`	`485`	`}`
	`486`	`+ string = (object == null) ? "null" : escape(object.toString());`
	`487`	`+ return (tagName == null) ? "\"" + string + "\"" :`
	`488`	`+ (string.length() == 0) ? "<" + tagName + "/>" :`
	`489`	`+ "<" + tagName + ">" + string + "</" + tagName + ">";`
	`490`	`+`
`489`	`491`	`}`
`490`	`492`	`}`