Merge
authorddehaven
Mon, 12 Dec 2016 20:54:41 -0800
changeset 42835 1dc3889eb057
parent 42813 5161872bab6b (current diff)
parent 42834 832c63c0692f (diff)
child 42836 1d55dcc9a118
Merge
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Mon Dec 12 18:56:45 2016 -0800
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Mon Dec 12 20:54:41 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)) {