Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 03:15:32 -04:00
Code Issues Projects Releases Wiki Activity

#863 fix changed behaviour of changing order in writeValue with JSONString

Browse Source
This commit is contained in:
Simulant 2024-02-25 09:42:06 +01:00
parent d878c38d40
commit 4f456d9432
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/json/JSONObject.java
View File

@ -2705,6 +2705,15 @@ public class JSONObject {
int indentFactor, int indent) throws JSONException, IOException { int indentFactor, int indent) throws JSONException, IOException {
if (value == null || value.equals(null)) { if (value == null || value.equals(null)) {
writer.write("null"); writer.write("null");
} else if (value instanceof JSONString) {
// JSONString must be checked first, so it can overwrite behaviour of other types
Object o;
try {
o = ((JSONString) value).toJSONString();
} catch (Exception e) {
throw new JSONException(e);
}
writer.write(o != null ? o.toString() : quote(value.toString()));
} else if (value instanceof String) { } else if (value instanceof String) {
// assuming most values are Strings, so testing it early // assuming most values are Strings, so testing it early
quote(value.toString(), writer); quote(value.toString(), writer);
@ -2733,14 +2742,6 @@ public class JSONObject {
new JSONArray(coll).write(writer, indentFactor, indent); new JSONArray(coll).write(writer, indentFactor, indent);
} else if (value instanceof Enum<?>) { } else if (value instanceof Enum<?>) {
writer.write(quote(((Enum<?>)value).name())); writer.write(quote(((Enum<?>)value).name()));
} else if (value instanceof JSONString) {
Object o;
try {
o = ((JSONString) value).toJSONString();
} catch (Exception e) {
throw new JSONException(e);
}
writer.write(o != null ? o.toString() : quote(value.toString()));
} else if (value.getClass().isArray()) { } else if (value.getClass().isArray()) {
new JSONArray(value).write(writer, indentFactor, indent); new JSONArray(value).write(writer, indentFactor, indent);
} else { } else {