mirror of
https://github.com/stleary/JSON-java.git
synced 2025-08-03 03:15:32 -04:00
Try making java 6 & old version javadoc generator compatible
This commit is contained in:
parent
10514e48cb
commit
21a9fae7b0
@ -6,7 +6,7 @@ package org.json;
|
|||||||
*/
|
*/
|
||||||
public enum JSONDuplicateKeyStrategy {
|
public enum JSONDuplicateKeyStrategy {
|
||||||
/**
|
/**
|
||||||
* The default value. And this is the way it used to be in the previous versions.<br/>
|
* The default value. And this is the way it used to be in the previous versions.<br>
|
||||||
* The JSONParser will throw an {@link JSONException} when meet duplicate key.
|
* The JSONParser will throw an {@link JSONException} when meet duplicate key.
|
||||||
*/
|
*/
|
||||||
THROW_EXCEPTION,
|
THROW_EXCEPTION,
|
||||||
|
@ -256,7 +256,7 @@ public class JSONObject {
|
|||||||
|
|
||||||
case MERGE_INTO_ARRAY:
|
case MERGE_INTO_ARRAY:
|
||||||
if (mergedKeys == null) {
|
if (mergedKeys == null) {
|
||||||
mergedKeys = new ArrayList<>();
|
mergedKeys = new ArrayList<String>();
|
||||||
}
|
}
|
||||||
|
|
||||||
Object current = this.get(key);
|
Object current = this.get(key);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user