# HG changeset patch
# User ddehaven
# Date 1480955776 28800
# Node ID 832c63c0692f8409b1e738063fbf54d2f4b0d4ba
# Parent  1cfad0990b99f9488362a896ffd94c42f1b2d853# Parent  9c19d5018da156164b55f9dac1fcdf5c6bbfa505
Merge

diff -r 1cfad0990b99 -r 832c63c0692f langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Mon Dec 05 19:00:56 2016 +0000
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Mon Dec 05 08:36:16 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)) {