Merge pull request #9879 from IQSS/9315-jsontry

use try with resources in JsonUtil
IQSS · Sep 11, 2023 · 2c6afef · 2c6afef
2 parents 6fee8e5 + 069bb91
commit 2c6afef
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonUtil.java
@@ -11,6 +11,7 @@
 import java.util.logging.Logger;
 import jakarta.json.Json;
 import jakarta.json.JsonArray;
+import jakarta.json.JsonReader;
 import jakarta.json.JsonWriter;
 import jakarta.json.JsonWriterFactory;
 import jakarta.json.stream.JsonGenerator;
@@ -60,13 +61,17 @@ public static String prettyPrint(jakarta.json.JsonObject jsonObject) {
 
     public static jakarta.json.JsonObject getJsonObject(String serializedJson) {
         try (StringReader rdr = new StringReader(serializedJson)) {
-            return Json.createReader(rdr).readObject();
+            try (JsonReader jsonReader = Json.createReader(rdr)) {
+                return jsonReader.readObject();
+            }
         }
     }
 
     public static jakarta.json.JsonArray getJsonArray(String serializedJson) {
         try (StringReader rdr = new StringReader(serializedJson)) {
-            return Json.createReader(rdr).readArray();
+            try (JsonReader jsonReader = Json.createReader(rdr)) {
+                return jsonReader.readArray();
+            }
         }
     }
 }