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

fix: DirectoryStream not closed

Browse Source
This commit is contained in:
Glavo
2021-09-08 11:04:36 +08:00
committed by Yuhui Huang
parent 1b72e43cce
commit d94b3385c7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
View File

@@ -24,10 +24,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.file.Files; import java.nio.file.*;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@@ -294,7 +291,13 @@ public final class JavaVersion {
private static Stream<Path> listDirectory(Path directory) throws IOException { private static Stream<Path> listDirectory(Path directory) throws IOException {
if (Files.isDirectory(directory)) { if (Files.isDirectory(directory)) {
return Files.list(directory); try (final DirectoryStream<Path> subDirs = Files.newDirectoryStream(directory)) {
final ArrayList<Path> paths = new ArrayList<>();
for (Path subDir : subDirs) {
paths.add(subDir);
}
return paths.stream();
}
} else { } else {
return Stream.empty(); return Stream.empty();
} }