--- old/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java	2018-04-10 12:01:16.000000000 -0700
+++ new/test/jdk/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java	2018-04-10 12:01:16.000000000 -0700
@@ -52,7 +52,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.spi.ToolProvider;
@@ -134,13 +136,14 @@
     }
 
     private void javac(Path source, Path destination, String srcpath) throws IOException {
-        String[] args = Stream.concat(
-                Stream.of("-d", destination.toString(), "--module-source-path", srcpath),
-                Files.walk(source)
-                        .map(Path::toString)
-                        .filter(s -> s.endsWith(".java"))
-        ).toArray(String[]::new);
-        int rc = JAVAC_TOOL.run(System.out, System.err, args);
+        List<String> args = new ArrayList<>(List.of("-d", destination.toString(), "--module-source-path", srcpath));
+        try (Stream<Path> pathStream = Files.walk(source)) {
+            pathStream.map(Path::toString)
+                      .filter(s -> s.endsWith(".java"))
+                      .forEach(args::add);
+        }
+
+        int rc = JAVAC_TOOL.run(System.out, System.err, args.toArray(new String[0]));
         Assert.assertEquals(rc, 0);
     }
 
@@ -149,7 +152,7 @@
         if (ignoreTest()) return;
 
         // use jlink to build image from multi-release jar
-       jlink("m1.jar", "myimage");
+        jlink("m1.jar", "myimage");
 
         // validate image
         Path jimage = userdir.resolve("myimage").resolve("lib").resolve("modules");