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

Merge pull request #907 from hexetia/fix-901

Browse Source 
Fix a bug when calling JSONArray.addAll() with Collection as Object
This commit is contained in:
Sean Leary 2024-11-13 16:29:34 -06:00 committed by GitHub
commit 2ee5bf13f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/json/JSONArray.java
View File

@ -1939,7 +1939,7 @@ public class JSONArray implements Iterable<Object> {
// JSONArray // JSONArray
this.myArrayList.addAll(((JSONArray)array).myArrayList); this.myArrayList.addAll(((JSONArray)array).myArrayList);
} else if (array instanceof Collection) { } else if (array instanceof Collection) {
this.addAll((Collection<?>)array, wrap, recursionDepth); this.addAll((Collection<?>)array, wrap, recursionDepth, jsonParserConfiguration);
} else if (array instanceof Iterable) { } else if (array instanceof Iterable) {
this.addAll((Iterable<?>)array, wrap); this.addAll((Iterable<?>)array, wrap);
} else { } else {

5
src/test/java/org/json/junit/JSONArrayTest.java
View File

@ -259,6 +259,11 @@ public class JSONArrayTest {
jsonArray.length(), jsonArray.length(),
len); len);
// collection as object
@SuppressWarnings("RedundantCast")
Object myListAsObject = (Object) myList;
jsonArray.putAll(myListAsObject);
for (int i = 0; i < myList.size(); i++) { for (int i = 0; i < myList.size(); i++) {
assertEquals("collection elements should be equal", assertEquals("collection elements should be equal",
myList.get(i), myList.get(i),