8170428: Move src.zip to JDK/lib/src.zip
authormchung
Tue, 29 Nov 2016 15:15:20 -0800
changeset 42832 be7a035526ab
parent 42406 3a2f57a44b57
child 42833 9c19d5018da1
8170428: Move src.zip to JDK/lib/src.zip Reviewed-by: jjg
langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Tue Nov 29 11:51:01 2016 +0100
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Tue Nov 29 15:15:20 2016 -0800
@@ -1273,7 +1273,7 @@
         }
         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)) {