src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java
branchJDK-8200758-branch
changeset 58670 6fb9e12d5595
parent 58302 718bd56695b3
child 58696 61c44899b4eb
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java	Wed Oct 16 10:32:08 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java	Thu Oct 17 07:55:35 2019 -0400
@@ -36,6 +36,7 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -82,8 +83,10 @@
         long reply = 0;
         for (Path dir : roots().stream().filter(f -> Files.isDirectory(f)).collect(
                 Collectors.toList())) {
-            reply += Files.walk(dir).filter(p -> Files.isRegularFile(p)).mapToLong(
-                    f -> f.toFile().length()).sum();
+            try (Stream<Path> stream = Files.walk(dir)) {
+                reply += stream.filter(p -> Files.isRegularFile(p)).mapToLong(
+                        f -> f.toFile().length()).sum();
+            }
         }
         return reply;
     }
@@ -145,8 +148,11 @@
             Path src = action.getKey();
             Path dst = action.getValue();
             if (src.toFile().isDirectory()) {
-                Files.walk(src).forEach(path -> actions.put(dst.resolve(
-                        src.relativize(path)).toAbsolutePath().normalize(), path));
+               try (Stream<Path> stream = Files.walk(src)) {
+                   stream.forEach(path -> actions.put(dst.resolve(
+                           src.relativize(path)).toAbsolutePath().normalize(),
+                           path));
+               }
             } else {
                 actions.put(dst.toAbsolutePath().normalize(), src);
             }