Ensure class resource stream is closed in ResourceUtils

This ensures that `ResourceUtils.loadResource` closes the resource stream when reading all bytes.
dakrone · Nov 7, 2024 · 42c4bcc · 42c4bcc
1 parent 897573a
commit 42c4bcc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/ResourceUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/template/ResourceUtils.java
@@ -35,11 +35,12 @@ static byte[] loadVersionedResourceUTF8(
     }
 
     public static String loadResource(Class<?> clazz, String name) throws IOException {
-        InputStream is = clazz.getResourceAsStream(name);
-        if (is == null) {
-            throw new IOException("Resource [" + name + "] not found in classpath.");
+        try (InputStream is = clazz.getResourceAsStream(name)) {
+            if (is == null) {
+                throw new IOException("Resource [" + name + "] not found in classpath.");
+            }
+            return new String(is.readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
         }
-        return new String(is.readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
     }
 
 }