fankes/JSON-java-compat
2
0
Fork 0
mirror of https://github.com/fankes/JSON-java-compat.git synced 2025-09-08 11:34:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test case passed with tags with multiple entries set forceList

Browse Source
This commit is contained in:
Zach
2021-11-19 21:22:38 -06:00
parent e638955034
commit 5dd78bc0b9
2 changed files with 94 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/json/XML.java
View File

@@ -380,12 +380,23 @@ public class XML {
if (x.nextToken() != GT) {
throw x.syntaxError("Misshaped tag");
}
if (nilAttributeFound) {
context.accumulate(tagName, JSONObject.NULL);
} else if (jsonObject.length() > 0) {
context.accumulate(tagName, jsonObject);
if (config.getForceList().contains(tagName)) {
// Force the value to be an array
if (nilAttributeFound) {
context.append(tagName, JSONObject.NULL);
} else if (jsonObject.length() > 0) {
context.append(tagName, jsonObject);
} else {
context.put(tagName, new JSONArray());
}
} else {
context.accumulate(tagName, "");
if (nilAttributeFound) {
context.accumulate(tagName, JSONObject.NULL);
} else if (jsonObject.length() > 0) {
context.accumulate(tagName, jsonObject);
} else {
context.accumulate(tagName, "");
}
}
return false;
@@ -414,6 +425,7 @@ public class XML {
// Nested element
if (parse(x, jsonObject, tagName, config)) {
if (config.getForceList().contains(tagName)) {
// Force the value to be an array
if (jsonObject.length() == 0) {
context.put(tagName, new JSONArray());
} else if (jsonObject.length() == 1