Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix resource leaks in PropertyUserStore, XmlConfiguraiton, and start.jar #7361

Merged
merged 2 commits into from
Jan 10, 2022
Merged

Fix resource leaks in PropertyUserStore, XmlConfiguraiton, and start.jar #7361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b42e23
fix resource leak
lujiefsi Jan 7, 2022
c436a93
fix style error
lujiefsi Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<>();

Expand Down
5 changes: 4 additions & 1 deletion jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down