changeset 17720:f2be0ae2a4d4

Merge
author mchung
date Wed, 14 Sep 2016 19:08:26 -0700
parents 08a361c50b48 851645a61277
children b25ebe289b7c
files
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/ClassLoader.java	Wed Sep 14 19:03:43 2016 -0700
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java	Wed Sep 14 19:08:26 2016 -0700
@@ -2677,6 +2677,8 @@
      * Returns a possible-empty stream of the layers with modules defined to
      * this class loader.
      *
+     * @apiNote TBD whether to keep this method or a variant of.
+     *
      * @return A stream of the layers with modules defined to this class loader
      * @since 9
      */
--- a/src/java.base/share/classes/java/lang/reflect/Module.java	Wed Sep 14 19:03:43 2016 -0700
+++ b/src/java.base/share/classes/java/lang/reflect/Module.java	Wed Sep 14 19:08:26 2016 -0700
@@ -1069,8 +1069,8 @@
             initExports(descriptor, nameToModule, m);
         }
 
-        // For the boot layer then register the modules in the class loader
-        // services catalog
+        // For now, register the modules in the boot layer. This will be
+        // re-examined once the ServiceLoader spec is updated.
         if (isBootLayer) {
             for (ResolvedModule resolvedModule : cf.modules()) {
                 ModuleReference mref = resolvedModule.reference();
@@ -1092,7 +1092,7 @@
             }
         }
 
-        // ClassLoader::layers support
+        // ClassLoader::layers support, TBD whether to keep this
         for (ClassLoader loader : loaders) {
             SharedSecrets.getJavaLangAccess().bindToLayer(loader, layer);
         }
--- a/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java	Wed Sep 14 19:03:43 2016 -0700
+++ b/src/java.base/share/classes/jdk/internal/module/ServicesCatalog.java	Wed Sep 14 19:08:26 2016 -0700
@@ -39,6 +39,8 @@
  * A <em>services catalog</em>. Each {@code ClassLoader} and {@code Layer} has
  * an optional {@code ServicesCatalog} for modules that provide services.
  *
+ * @apiNote This class will be replaced once the ServiceLoader spec is updated.
+ *
  * @see java.util.ServiceLoader
  */
 public final class ServicesCatalog {