Merge branch 'master' into 863-improve-toString-performance-StringBuilderWriter

This commit is contained in:
Simulant
2024-03-10 21:10:21 +01:00
28 changed files with 605 additions and 714 deletions

View File

@@ -359,7 +359,7 @@ public class JSONArray implements Iterable<Object> {
if (object instanceof Number) {
return (Number)object;
}
return NumberConversionUtil.stringToNumber(object.toString());
return JSONObject.stringToNumber(object.toString());
} catch (Exception e) {
throw wrongValueFormatException(index, "number", object, e);
}
@@ -1106,7 +1106,7 @@ public class JSONArray implements Iterable<Object> {
if (val instanceof String) {
try {
return NumberConversionUtil.stringToNumber((String) val);
return JSONObject.stringToNumber((String) val);
} catch (Exception e) {
return defaultValue;
}