Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1902:e118c818dbf8 jdk-9+167
Merge
author | lana |
---|---|
date | Fri, 21 Apr 2017 03:33:55 +0000 |
parents | 85bf1d0aeb09 (current diff) a623ab461523 (diff) |
children | 98935976d88c a3022cc65b17 |
files | |
diffstat | 4 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/project.properties Thu Apr 20 18:14:07 2017 +0000 +++ b/make/project.properties Fri Apr 21 03:33:55 2017 +0000 @@ -37,7 +37,8 @@ javadoc.option=\ -tag "implSpec:a:Implementation Requirements:" \ - -tag "implNote:a:Implementation Note:" + -tag "implNote:a:Implementation Note:" \ + -tag "moduleGraph:a:Module Graph" # nashorn version information nashorn.version=0.1
--- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java Thu Apr 20 18:14:07 2017 +0000 +++ b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java Fri Apr 21 03:33:55 2017 +0000 @@ -281,8 +281,7 @@ } } - // FIXME: needs to be changed to use javase 9 docs later - private static String JAVADOC_BASE = "http://download.java.net/jdk9/docs/api/"; + private static String JAVADOC_BASE = "https://docs.oracle.com/javase/9/docs/api/"; private static void openBrowserForJavadoc(String relativeUrl) { try {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java Thu Apr 20 18:14:07 2017 +0000 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java Fri Apr 21 03:33:55 2017 +0000 @@ -114,7 +114,11 @@ @Override public Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException { try { - Context.checkPackageAccess(name); + final int i = name.lastIndexOf('.'); + if(i != -1){ + final String pkgName = name.substring(0,i); + Context.checkPackageAccess(pkgName); + } return super.loadClass(name, resolve); } catch (final SecurityException se) { // we may be implementing an interface or extending a class that was