chore: added checks for not null

ArcadeData · Jan 28, 2025 · 59978e7 · 59978e7
1 parent 30cb147
commit 59978e7
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/engine/src/main/java/com/arcadedb/serializer/json/JSONObject.java b/engine/src/main/java/com/arcadedb/serializer/json/JSONObject.java
@@ -74,19 +74,23 @@ public JSONObject(final JsonObject input) {
   }
 
   public JSONObject(final String input) {
-    try {
-      final JsonReader reader = new JsonReader(new StringReader(input));
-      reader.setStrictness(Strictness.LENIENT);
-      object = JsonParser.parseReader(reader).getAsJsonObject();
-    } catch (Exception e) {
-      throw new JSONException("Invalid JSON object format", e);
-    }
+    if (input != null) {
+      try {
+        final JsonReader reader = new JsonReader(new StringReader(input));
+        reader.setStrictness(Strictness.LENIENT);
+        object = JsonParser.parseReader(reader).getAsJsonObject();
+      } catch (Exception e) {
+        throw new JSONException("Invalid JSON object format", e);
+      }
+    } else
+      object = new JsonObject();
   }
 
   public JSONObject(final Map<String, ?> map) {
     object = new JsonObject();
-    for (Map.Entry<String, ?> entry : map.entrySet())
-      put(entry.getKey(), entry.getValue());
+    if (map != null)
+      for (Map.Entry<String, ?> entry : map.entrySet())
+        put(entry.getKey(), entry.getValue());
   }
 
   public JSONObject copy() {