Fri, 06 Sep 2013 17:10:02 -0700
Merge
1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java Fri Sep 06 14:20:49 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java Fri Sep 06 17:10:02 2013 -0700 1.3 @@ -34,6 +34,7 @@ 1.4 import java.io.OutputStreamWriter; 1.5 import java.io.UnsupportedEncodingException; 1.6 import java.io.Writer; 1.7 +import java.nio.file.DirectoryStream; 1.8 import java.nio.file.Files; 1.9 import java.nio.file.Path; 1.10 import java.util.ArrayList; 1.11 @@ -221,8 +222,10 @@ 1.12 /** If the file is a directory, list its contents. */ 1.13 public Iterable<DocFile> list() throws IOException { 1.14 List<DocFile> files = new ArrayList<DocFile>(); 1.15 - for (Path f: Files.newDirectoryStream(file)) { 1.16 - files.add(new StandardDocFile(f)); 1.17 + try (DirectoryStream<Path> ds = Files.newDirectoryStream(file)) { 1.18 + for (Path f: ds) { 1.19 + files.add(new StandardDocFile(f)); 1.20 + } 1.21 } 1.22 return files; 1.23 }
2.1 --- a/test/tools/javadoc/api/basic/APITest.java Fri Sep 06 14:20:49 2013 -0700 2.2 +++ b/test/tools/javadoc/api/basic/APITest.java Fri Sep 06 17:10:02 2013 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it 2.10 @@ -29,6 +29,7 @@ 2.11 import java.lang.reflect.InvocationTargetException; 2.12 import java.lang.reflect.Method; 2.13 import java.net.URI; 2.14 +import java.nio.file.DirectoryStream; 2.15 import java.nio.file.Files; 2.16 import java.nio.file.Path; 2.17 import java.util.Arrays; 2.18 @@ -164,11 +165,13 @@ 2.19 } 2.20 2.21 private void listFiles(Path dir, Set<Path> files) throws IOException { 2.22 - for (Path f: Files.newDirectoryStream(dir)) { 2.23 - if (Files.isDirectory(f)) 2.24 - listFiles(f, files); 2.25 - else if (Files.isRegularFile(f)) 2.26 - files.add(f); 2.27 + try (DirectoryStream<Path> ds = Files.newDirectoryStream(dir)) { 2.28 + for (Path f: ds) { 2.29 + if (Files.isDirectory(f)) 2.30 + listFiles(f, files); 2.31 + else if (Files.isRegularFile(f)) 2.32 + files.add(f); 2.33 + } 2.34 } 2.35 } 2.36
3.1 --- a/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java Fri Sep 06 14:20:49 2013 -0700 3.2 +++ b/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java Fri Sep 06 17:10:02 2013 -0700 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it 3.10 @@ -23,7 +23,7 @@ 3.11 3.12 /* 3.13 * @test 3.14 - * @bug 6493690 3.15 + * @bug 6493690 8024434 3.16 * @summary javadoc should have a javax.tools.Tool service provider 3.17 * @build APITest 3.18 * @run main GetTask_FileManagerTest