8290504: Close streams returned by ModuleReader::list

Reviewed-by: mchung, chegar
openjdk · Jul 21, 2022 · 80bd8c3 · 80bd8c3
1 parent 15f4b30
commit 80bd8c3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Main.java b/test/jdk/java/lang/ClassLoader/getResource/automaticmodules/Main.java
@@ -28,6 +28,7 @@
 import java.lang.module.ResolvedModule;
 import java.net.URL;
 import java.util.Enumeration;
+import java.util.stream.Stream;
 
 /**
  * Usage: Main $MODULE
@@ -79,8 +80,9 @@ public static void main(String[] args) throws Exception {
                 .map(ResolvedModule::reference)
                 .orElseThrow(() -> new RuntimeException(mn + " not resolved!!"));
 
-        try (ModuleReader reader = mref.open()) {
-            reader.list().forEach(name -> {
+        try (ModuleReader reader = mref.open();
+             Stream<String> stream = reader.list()) {
+            stream.forEach(name -> {
                 testFindUnchecked(name);
 
                 // if the resource is a directory then find without trailing slash

diff --git a/test/jdk/java/lang/invoke/callerSensitive/CallerSensitiveAccess.java b/test/jdk/java/lang/invoke/callerSensitive/CallerSensitiveAccess.java
@@ -62,9 +62,10 @@ public class CallerSensitiveAccess {
      */
     @DataProvider(name = "callerSensitiveMethods")
     static Object[][] callerSensitiveMethods() {
-        return callerSensitiveMethods(Object.class.getModule())
-                .map(m -> new Object[] { m, shortDescription(m) })
-                .toArray(Object[][]::new);
+        try (Stream<Method> stream = callerSensitiveMethods(Object.class.getModule())) {
+            return stream.map(m -> new Object[]{m, shortDescription(m)})
+                    .toArray(Object[][]::new);
+        }
     }
 
     /**
@@ -100,11 +101,13 @@ public void testPublicLookupUnreflect(@NoInjection Method method, String desc) t
      */
     @DataProvider(name = "accessibleCallerSensitiveMethods")
     static Object[][] accessibleCallerSensitiveMethods() {
-        return callerSensitiveMethods(Object.class.getModule())
+        try (Stream<Method> stream = callerSensitiveMethods(Object.class.getModule())) {
+            return stream
                 .filter(m -> Modifier.isPublic(m.getModifiers()))
                 .map(m -> { m.setAccessible(true); return m; })
                 .map(m -> new Object[] { m, shortDescription(m) })
                 .toArray(Object[][]::new);
+        }
     }
 
     /**

diff --git a/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
@@ -54,6 +54,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.spi.ToolProvider;
+import java.util.stream.Stream;
 
 import jdk.internal.module.ModulePath;
 import jdk.test.lib.compiler.CompilerUtils;
@@ -413,7 +414,10 @@ void testRead(ModuleReader reader, String name, byte[] expectedBytes)
      * Test ModuleReader#list
      */
     void testList(ModuleReader reader, String name) throws IOException {
-        List<String> list = reader.list().collect(Collectors.toList());
+        final List<String> list;
+        try (Stream<String> stream = reader.list()) {
+            list = stream.toList();
+        }
         Set<String> names = new HashSet<>(list);
         assertTrue(names.size() == list.size()); // no duplicates
 

diff --git a/test/jdk/java/lang/module/customfs/ModulesInCustomFileSystem.java b/test/jdk/java/lang/module/customfs/ModulesInCustomFileSystem.java
@@ -44,6 +44,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import jdk.test.lib.util.JarUtils;
 
@@ -108,8 +109,9 @@ private void testZipFileSystem(Path zip) throws Exception {
     private void listAllModules(ModuleFinder finder) throws Exception {
         for (ModuleReference mref : finder.findAll()) {
             System.out.println(mref.descriptor());
-            try (ModuleReader reader = mref.open()) {
-                reader.list().forEach(name -> System.out.format("  %s%n", name));
+            try (ModuleReader reader = mref.open();
+                 Stream<String> stream = reader.list()) {
+                stream.forEach(name -> System.out.format("  %s%n", name));
             }
         }
     }