--- a/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java Thu Apr 06 17:01:01 2017 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java Fri Apr 07 08:04:46 2017 +0000
@@ -41,8 +41,6 @@
import java.lang.module.Configuration;
import java.lang.module.ModuleDescriptor;
import java.lang.module.ModuleFinder;
-import java.lang.reflect.Layer;
-import java.lang.reflect.Module;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -61,7 +59,7 @@
public class ExportAllUnnamed {
- // Create a Layer over the boot layer.
+ // Create a layer over the boot layer.
// Define modules within this layer to test access between
// publically defined classes within packages of those modules.
public void createLayerOnBoot() throws Throwable {
@@ -90,7 +88,7 @@
ModuleFinder finder = ModuleLibrary.of(descriptor_m1x, descriptor_m2x);
// Resolves "m1x"
- Configuration cf = Layer.boot()
+ Configuration cf = ModuleLayer.boot()
.configuration()
.resolve(finder, ModuleFinder.of(), Set.of("m1x"));
@@ -99,8 +97,8 @@
map.put("m1x", MySameClassLoader.loader1);
map.put("m2x", MySameClassLoader.loader1);
- // Create Layer that contains m1x & m2x
- Layer layer = Layer.boot().defineModules(cf, map::get);
+ // Create layer that contains m1x & m2x
+ ModuleLayer layer = ModuleLayer.boot().defineModules(cf, map::get);
assertTrue(layer.findLoader("m1x") == MySameClassLoader.loader1);
assertTrue(layer.findLoader("m2x") == MySameClassLoader.loader1);