@@ -24,7 +24,6 @@ of this software and associated documentation files (the "Software"), to deal
24
24
SOFTWARE.
25
25
*/
26
26
27
- import java .lang .reflect .Array ;
28
27
import java .util .Iterator ;
29
28
30
29
@@ -460,17 +459,6 @@ public static String toString(Object object, String tagName)
460
459
sb .append (toString (value , key ));
461
460
}
462
461
}
463
- } else if (value .getClass ().isArray ()) {
464
- length = Array .getLength (value );
465
- for (i = 0 ; i < length ; i += 1 ) {
466
- sb .append ('<' );
467
- sb .append (key );
468
- sb .append ('>' );
469
- sb .append (Array .get (value , i ).toString ());
470
- sb .append ("</" );
471
- sb .append (key );
472
- sb .append ('>' );
473
- }
474
462
} else if (value .equals ("" )) {
475
463
sb .append ('<' );
476
464
sb .append (key );
@@ -495,18 +483,23 @@ public static String toString(Object object, String tagName)
495
483
// XML does not have good support for arrays. If an array appears in a place
496
484
// where XML is lacking, synthesize an <array> element.
497
485
498
- } else if (object instanceof JSONArray ) {
499
- ja = (JSONArray )object ;
500
- length = ja .length ();
501
- for (i = 0 ; i < length ; i += 1 ) {
502
- sb .append (toString (ja .opt (i ), tagName == null ? "array" : tagName ));
503
- }
504
- return sb .toString ();
505
486
} else {
506
- string = (object == null ) ? "null" : escape (object .toString ());
507
- return (tagName == null ) ? "\" " + string + "\" " :
508
- (string .length () == 0 ) ? "<" + tagName + "/>" :
509
- "<" + tagName + ">" + string + "</" + tagName + ">" ;
487
+ if (object .getClass ().isArray ()) {
488
+ object = new JSONArray (object );
489
+ }
490
+ if (object instanceof JSONArray ) {
491
+ ja = (JSONArray )object ;
492
+ length = ja .length ();
493
+ for (i = 0 ; i < length ; i += 1 ) {
494
+ sb .append (toString (ja .opt (i ), tagName == null ? "array" : tagName ));
495
+ }
496
+ return sb .toString ();
497
+ } else {
498
+ string = (object == null ) ? "null" : escape (object .toString ());
499
+ return (tagName == null ) ? "\" " + string + "\" " :
500
+ (string .length () == 0 ) ? "<" + tagName + "/>" :
501
+ "<" + tagName + ">" + string + "</" + tagName + ">" ;
502
+ }
510
503
}
511
504
}
512
505
}
0 commit comments