--- a/hotspot/test/runtime/modules/AccessCheck/CheckRead.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/CheckRead.java Sat May 21 08:00:33 2016 +0100
@@ -103,7 +103,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java Sat May 21 08:00:33 2016 +0100
@@ -103,7 +103,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java Sat May 21 08:00:33 2016 +0100
@@ -105,7 +105,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java Sat May 21 08:00:33 2016 +0100
@@ -91,7 +91,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java Sat May 21 08:00:33 2016 +0100
@@ -92,7 +92,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java Sat May 21 08:00:33 2016 +0100
@@ -91,7 +91,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java Sat May 21 08:00:33 2016 +0100
@@ -92,7 +92,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@@ -141,7 +141,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@@ -190,7 +190,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java Sat May 21 08:00:33 2016 +0100
@@ -87,7 +87,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@@ -136,7 +136,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
--- a/hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java Sat May 21 08:00:33 2016 +0100
@@ -105,7 +105,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java Sat May 21 08:00:33 2016 +0100
@@ -81,7 +81,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java Sat May 21 08:00:33 2016 +0100
@@ -81,7 +81,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java Sat May 21 08:00:33 2016 +0100
@@ -93,7 +93,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java Sat May 21 08:00:33 2016 +0100
@@ -91,7 +91,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/Umod.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod.java Sat May 21 08:00:33 2016 +0100
@@ -92,7 +92,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map module m1 to class loader.
// class c2 will be loaded in an unnamed module/loader.
@@ -138,7 +138,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MySameClassLoader loader = new MySameClassLoader();
// map module m1 to class loader.
@@ -184,7 +184,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MySameClassLoader loader = new MySameClassLoader();
// map module m1 to class loader.
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java Sat May 21 08:00:33 2016 +0100
@@ -92,7 +92,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java Sat May 21 08:00:33 2016 +0100
@@ -92,7 +92,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java Sat May 21 08:00:33 2016 +0100
@@ -91,7 +91,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java Sat May 21 08:00:33 2016 +0100
@@ -87,7 +87,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map module m1 to class loader.
// class c4 will be loaded in an unnamed module/loader.
@@ -133,7 +133,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MySameClassLoader loader = new MySameClassLoader();
// map module m1 to class loader.
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java Sat May 21 08:00:33 2016 +0100
@@ -92,7 +92,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java Sat May 21 08:00:33 2016 +0100
@@ -91,7 +91,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java Sat May 21 08:00:33 2016 +0100
@@ -101,7 +101,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java Sat May 21 08:00:33 2016 +0100
@@ -89,7 +89,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java Sat May 21 08:00:33 2016 +0100
@@ -101,7 +101,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java Sat May 21 08:00:33 2016 +0100
@@ -91,7 +91,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java Thu May 19 19:45:52 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java Sat May 21 08:00:33 2016 +0100
@@ -89,7 +89,7 @@
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
- .resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
+ .resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();