changeset 2170:05c71e51ed22

Merge
author alanb
date Thu, 27 Apr 2017 17:17:27 +0100
parents e89bf7fa0a32 98935976d88c
children 9d00d3d26242
files .hgtags make/project.properties src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
diffstat 5 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 20 20:16:11 2017 +0100
+++ b/.hgtags	Thu Apr 27 17:17:27 2017 +0100
@@ -403,3 +403,4 @@
 b3ea15f8d67db5507f1fe49caed01494ec3c7de6 jpms-pr2
 e36e62d3ea53c316f295b37bcc19867fbf510235 jdk-9+165
 5b2e7b2101c0048ba9f1df722e56611f523fdfe8 jdk-9+166
+e118c818dbf84d15191414c453b77c089116fdc0 jdk-9+167
--- a/make/project.properties	Thu Apr 20 20:16:11 2017 +0100
+++ b/make/project.properties	Thu Apr 27 17:17:27 2017 +0100
@@ -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 20:16:11 2017 +0100
+++ b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java	Thu Apr 27 17:17:27 2017 +0100
@@ -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 20:16:11 2017 +0100
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java	Thu Apr 27 17:17:27 2017 +0100
@@ -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
--- a/test/TEST.ROOT	Thu Apr 20 20:16:11 2017 +0100
+++ b/test/TEST.ROOT	Thu Apr 27 17:17:27 2017 +0100
@@ -12,3 +12,6 @@
 
 # Use new module options
 useNewOptions=true
+
+# Use --patch-module instead of -Xmodule:
+useNewPatchModule=true