stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8169816: Move src.zip and jrt-fs.jar under the lib directory

Browse Source 
Reviewed-by: alanb, erikj, jjg
This commit is contained in:
Mandy Chung 2016-11-28 11:36:43 -08:00
parent f9f47ab866
commit 9a86634434
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
View File

@ -1396,7 +1396,8 @@ public class Locations {
}
private void update(Path p) {
if (!isCurrentPlatform(p) && !Files.exists(p.resolve("jrt-fs.jar")) && !Files.exists(systemJavaHome.resolve("modules")))
if (!isCurrentPlatform(p) && !Files.exists(p.resolve("lib").resolve("jrt-fs.jar")) &&
!Files.exists(systemJavaHome.resolve("modules")))
throw new IllegalArgumentException(p.toString());
systemJavaHome = p;
modules = null;

2
langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
View File

@ -1273,7 +1273,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
}
List<Path> result = new ArrayList<>();
Path home = Paths.get(System.getProperty("java.home"));
Path srcZip = home.resolve("src.zip");
Path srcZip = home.resolve("lib").resolve("src.zip");
if (!Files.isReadable(srcZip))
srcZip = home.getParent().resolve("src.zip");
if (Files.isReadable(srcZip)) {