8290316: Ensure that all directory streams are closed in java.base

Reviewed-by: chegar

Author: rjernst

src/java.base/share/classes/java/time/chrono/HijrahChronology.java

@@ -86,6 +86,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Stream;
 
 import sun.util.logging.PlatformLogger;
 
@@ -1035,9 +1036,8 @@ private static void registerCustomChrono() {
  AccessController.doPrivileged(
  (PrivilegedAction<Void>)() -> {
  if (Files.isDirectory(CONF_PATH)) {
- try {
- Files.list(CONF_PATH)
- .map(p -> p.getFileName().toString())
+ try (Stream<Path> stream = Files.list(CONF_PATH)) {
+ stream.map(p -> p.getFileName().toString())
  .filter(fn -> fn.matches("hijrah-config-[^\\.]+\\.properties"))
  .map(fn -> fn.replaceAll("(hijrah-config-|\\.properties)", ""))
  .forEach(idtype -> {

src/java.base/share/classes/jdk/internal/jrtfs/ExplodedImage.java

@@ -38,6 +38,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import jdk.internal.jimage.ImageReader.Node;
 
@@ -254,19 +255,21 @@ private void initNodes() throws IOException {
  String moduleName = module.getFileName().toString();
  // make sure "/modules/<moduleName>" is created
  findModulesNode(MODULES + moduleName);
- Files.walk(module).filter(Files::isDirectory).forEach((p) -> {
- p = module.relativize(p);
- String pkgName = slashesToDots(p.toString());
- // skip META-INFO and empty strings
- if (!pkgName.isEmpty() && !pkgName.startsWith("META-INF")) {
- List<String> moduleNames = packageToModules.get(pkgName);
- if (moduleNames == null) {
- moduleNames = new ArrayList<>();
- packageToModules.put(pkgName, moduleNames);
+ try (Stream<Path> contentsStream = Files.walk(module)) {
+ contentsStream.filter(Files::isDirectory).forEach((p) -> {
+ p = module.relativize(p);
+ String pkgName = slashesToDots(p.toString());
+ // skip META-INF and empty strings
+ if (!pkgName.isEmpty() && !pkgName.startsWith("META-INF")) {
+ List<String> moduleNames = packageToModules.get(pkgName);
+ if (moduleNames == null) {
+ moduleNames = new ArrayList<>();
+ packageToModules.put(pkgName, moduleNames);
+ }
+ moduleNames.add(moduleName);
  }
- moduleNames.add(moduleName);
- }
- });
+ });
+ }
  }
  }
  }

src/java.base/share/classes/jdk/internal/module/ModuleHashes.java

@@ -41,6 +41,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 /**
  * The result of hashing the contents of a number of module artifacts.
@@ -114,9 +115,9 @@ private static byte[] computeHash(ModuleReader reader, String algorithm) {
  } catch (NoSuchAlgorithmException e) {
  throw new IllegalArgumentException(e);
  }
- try {
-  byte[] buf = new byte[32*1024];
- reader.list().sorted().forEach(rn -> {
+ byte[] buf = new byte[32*1024];
+ try (Stream<String> stream = reader.list()) {
+ stream.sorted().forEach(rn -> {
  md.update(rn.getBytes(StandardCharsets.UTF_8));
  try (InputStream in = reader.open(rn).orElseThrow()) {
  int n;

src/java.base/share/classes/jdk/internal/module/ModulePatcher.java

@@ -131,14 +131,15 @@ public ModuleReference patchIfNeeded(ModuleReference mref) {
 
  // exploded directory without following sym links
  Path top = file;
- Files.find(top, Integer.MAX_VALUE,
-  ((path, attrs) -> attrs.isRegularFile()))
-  .filter(path -> (!isAutomatic
- || path.toString().endsWith(".class"))
- && !isHidden(path))
+ try (Stream<Path> stream = Files.find(top, Integer.MAX_VALUE,
+ ((path, attrs) -> attrs.isRegularFile()))) {
+ stream.filter(path -> (!isAutomatic
+  || path.toString().endsWith(".class"))
+  && !isHidden(path))
  .map(path -> toPackageName(top, path))
  .filter(Checks::isPackageName)
  .forEach(packages::add);
+ }
 
  }
  }

src/java.base/share/classes/jdk/internal/module/ModulePath.java

@@ -58,6 +58,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
@@ -663,13 +664,12 @@ private ModuleReference readJar(Path file) throws IOException {
 
  private Set<String> explodedPackages(Path dir) {
  String separator = dir.getFileSystem().getSeparator();
- try {
- return Files.find(dir, Integer.MAX_VALUE,
- ((path, attrs) -> attrs.isRegularFile() && !isHidden(path)))
- .map(path -> dir.relativize(path))
- .map(path -> toPackageName(path, separator))
- .flatMap(Optional::stream)
- .collect(Collectors.toSet());
+ try (Stream<Path> stream = Files.find(dir, Integer.MAX_VALUE,
+ (path, attrs) -> attrs.isRegularFile() && !isHidden(path))) {
+ return stream.map(dir::relativize)
+ .map(path -> toPackageName(path, separator))
+ .flatMap(Optional::stream)
+ .collect(Collectors.toSet());
  } catch (IOException x) {
  throw new UncheckedIOException(x);
  }