1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8259645: Revert JDK-8245956 JavaCompiler still uses File API instead of Path API in a specific case

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Jonathan Gibbons 2021-01-12 19:57:08 +00:00
parent b03880e33b
commit 5f9cd72c54
2 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
View File

@ -741,13 +741,13 @@ public class JavacFileManager extends BaseFileManager implements StandardJavaFil
@Override @DefinedBy(Api.COMPILER) @Override @DefinedBy(Api.COMPILER)
public ClassLoader getClassLoader(Location location) { public ClassLoader getClassLoader(Location location) {
checkNotModuleOrientedLocation(location); checkNotModuleOrientedLocation(location);
Collection<? extends Path> searchPath = getLocationAsPaths(location); Iterable<? extends File> path = getLocation(location);
if (searchPath == null) if (path == null)
return null; return null;
ListBuffer<URL> lb = new ListBuffer<>(); ListBuffer<URL> lb = new ListBuffer<>();
for (Path p : searchPath) { for (File f: path) {
try { try {
lb.append(p.toUri().toURL()); lb.append(f.toURI().toURL());
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
throw new AssertionError(e); throw new AssertionError(e);
} }

67
test/langtools/tools/javac/T8245956/T8245956.java
View File

@ -1,67 +0,0 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8245956
* @summary JavaCompiler still uses File API instead of Path API in a specific case
* @run main T8245956
*/
import java.net.URI;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import javax.tools.DiagnosticCollector;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
public class T8245956 {
public static void main(String[] args) throws Exception {
Path zipFilePath = Path.of("T8245956.zip");
URI zipFileUri = zipFilePath.toUri();
URI jarZipFileUri = URI.create("jar:" + zipFileUri.toString());
Map<String, String> env = new LinkedHashMap<>();
env.put("create", "true");
try (FileSystem fs = FileSystems.newFileSystem(jarZipFileUri, env)) {
Path fsPath = fs.getPath("");
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<>();
try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnosticCollector, null, null)) {
List<Path> classPath = new ArrayList<>();
classPath.add(fsPath);
fileManager.setLocationFromPaths(StandardLocation.CLASS_PATH, classPath);
fileManager.getClassLoader(StandardLocation.CLASS_PATH); // Should not generate any exceptions.
System.out.println("The method getClassLoader terminated normally.\n");
}
}
}
}