fix resource leak (#7361)

Fix resource leaks
jetty · Jan 10, 2022 · ff10c26 · ff10c26
1 parent 1984d2d
commit ff10c26
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
@@ -16,6 +16,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -218,7 +219,10 @@ protected void loadUsers() throws IOException
             throw new IllegalStateException("Config does not exist: " + config);
 
         Properties properties = new Properties();
-        properties.load(config.getInputStream());
+        try (InputStream inputStream = config.getInputStream())
+        {
+            properties.load(inputStream);
+        }
 
         Set<String> known = new HashSet<>();
 

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
@@ -70,7 +70,10 @@ public Modules(BaseHome basehome, StartArgs args)
             Path deprecatedPath = _baseHome.getPath("modules/deprecated.properties");
             if (deprecatedPath != null && FS.exists(deprecatedPath))
             {
-                _deprecated.load(new FileInputStream(deprecatedPath.toFile()));
+                try (FileInputStream inputStream = new FileInputStream(deprecatedPath.toFile()))
+                {
+                    _deprecated.load(inputStream);
+                }
             }
         }
         catch (IOException e)

diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -1823,7 +1823,12 @@ public static void main(final String... args) throws Exception
                         properties.put(arg.substring(0, i), arg.substring(i + 1));
                     }
                     else if (arg.toLowerCase(Locale.ENGLISH).endsWith(".properties"))
-                        properties.load(Resource.newResource(arg).getInputStream());
+                    {
+                        try (InputStream inputStream = Resource.newResource(arg).getInputStream())
+                        {
+                            properties.load(inputStream);
+                        }
+                    }
                 }
 
                 // For all arguments, parse XMLs