From 21a9fae7b042829f76e1f8ae7aab1ece66f72fb3 Mon Sep 17 00:00:00 2001
From: XIAYM-gh <xiaym123@qq.com>
Date: Tue, 13 Feb 2024 22:33:30 +0800
Subject: [PATCH] Try making java 6 & old version javadoc generator compatible

---
 src/main/java/org/json/JSONDuplicateKeyStrategy.java | 2 +-
 src/main/java/org/json/JSONObject.java               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/json/JSONDuplicateKeyStrategy.java b/src/main/java/org/json/JSONDuplicateKeyStrategy.java
index 4652dbc..954ac3a 100644
--- a/src/main/java/org/json/JSONDuplicateKeyStrategy.java
+++ b/src/main/java/org/json/JSONDuplicateKeyStrategy.java
@@ -6,7 +6,7 @@ package org.json;
  */
 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.
      */
     THROW_EXCEPTION,
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index e7d5cd5..1572a81 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -256,7 +256,7 @@ public class JSONObject {
 
                         case MERGE_INTO_ARRAY:
                             if (mergedKeys == null) {
-                                mergedKeys = new ArrayList<>();
+                                mergedKeys = new ArrayList<String>();
                             }
 
                             Object current = this.get(key);