# HG changeset patch
# User ddehaven
# Date 1481918298 28800
# Node ID 1d55dcc9a1188606eb10261a83503ba1363e9cd5
# Parent  feff6f2960196f2ff1cc3ce01f4e75eea012e0fe# Parent  1dc3889eb057641ac10a191536529d4a8e47489d
Merge

diff -r feff6f296019 -r 1d55dcc9a118 langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Fri Dec 16 09:07:57 2016 -0800
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Fri Dec 16 11:58:18 2016 -0800
@@ -1274,7 +1274,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)) {