lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: DirectoryStream not closed

Browse Source 
dc31674721 (r53347194)
This commit is contained in:
Haowei Wen
2021-07-12 13:19:16 +08:00
parent 46a7269087
commit e7d5faeeac
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/JavaRepository.java
View File

@@ -9,6 +9,7 @@ import org.jackhuang.hmcl.util.platform.JavaVersion;
import org.jackhuang.hmcl.util.platform.OperatingSystem; import org.jackhuang.hmcl.util.platform.OperatingSystem;
import java.io.IOException; import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Optional; import java.util.Optional;
@@ -45,7 +46,8 @@ public final class JavaRepository {
String platform = platformOptional.get(); String platform = platformOptional.get();
Path javaStoragePath = getJavaStoragePath(); Path javaStoragePath = getJavaStoragePath();
if (Files.isDirectory(javaStoragePath)) { if (Files.isDirectory(javaStoragePath)) {
for (Path component : Files.newDirectoryStream(javaStoragePath)) { try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(javaStoragePath)) {
for (Path component : dirStream) {
Path javaHome = component.resolve(platform).resolve(component.getFileName()); Path javaHome = component.resolve(platform).resolve(component.getFileName());
try { try {
addJava(javaHome); addJava(javaHome);
@@ -56,6 +58,7 @@ public final class JavaRepository {
} }
} }
} }
}
public static Optional<String> getCurrentJavaPlatform() { public static Optional<String> getCurrentJavaPlatform() {
if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) { if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {