Wed, 23 Oct 2013 23:02:17 +0200
8027191: Fix for JDK-8026861 refers to an incorrect bug number
Summary: Reverting changeset b05db8c815e8, so that it can be applied again with a correct bug number
Reviewed-by: jjg
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test 6403456 |
aoqi@0 | 26 | * @summary javax.tools.JavaCompilerTool.getStandardFileManager().list() includes directories |
aoqi@0 | 27 | */ |
aoqi@0 | 28 | |
aoqi@0 | 29 | import javax.tools.*; |
aoqi@0 | 30 | import java.util.*; |
aoqi@0 | 31 | import java.io.*; |
aoqi@0 | 32 | |
aoqi@0 | 33 | import static javax.tools.JavaFileObject.Kind; |
aoqi@0 | 34 | |
aoqi@0 | 35 | public class T6340549 { |
aoqi@0 | 36 | public static void main(String... args) throws Exception { |
aoqi@0 | 37 | |
aoqi@0 | 38 | // Ensure a directory exists |
aoqi@0 | 39 | File dir = new File("temp" + args.hashCode()); |
aoqi@0 | 40 | if (!dir.exists()) |
aoqi@0 | 41 | dir.mkdir(); |
aoqi@0 | 42 | if (!dir.isDirectory()) |
aoqi@0 | 43 | throw new AssertionError("Not a directory " + dir); |
aoqi@0 | 44 | |
aoqi@0 | 45 | try { |
aoqi@0 | 46 | JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); |
aoqi@0 | 47 | StandardJavaFileManager jfm = compiler.getStandardFileManager(null, null, null); |
aoqi@0 | 48 | jfm.setLocation(StandardLocation.CLASS_PATH, Arrays.asList(new File("."))); |
aoqi@0 | 49 | |
aoqi@0 | 50 | for (JavaFileObject jfo : jfm.list(StandardLocation.CLASS_PATH, |
aoqi@0 | 51 | "", EnumSet.of(Kind.OTHER), false)) { |
aoqi@0 | 52 | if (new File(jfo.getName()).isDirectory()) { |
aoqi@0 | 53 | throw new AssertionError("Found directory: " + jfo); |
aoqi@0 | 54 | } |
aoqi@0 | 55 | } |
aoqi@0 | 56 | } finally { |
aoqi@0 | 57 | dir.delete(); // cleanup |
aoqi@0 | 58 | } |
aoqi@0 | 59 | } |
aoqi@0 | 60 | } |