From 090b01cc4142ff3e85243ec2920baca85b7873af Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Fri, 16 Dec 2016 05:49:14 +0000 Subject: [PATCH] 8170987: Module system implementation refresh (12/2016) Reviewed-by: mchung --- .../jdk/nashorn/internal/runtime/Context.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java index c40943b60fe..a40ed5f22ce 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java @@ -39,7 +39,6 @@ import java.io.File; import java.io.InputStream; import java.io.IOException; import java.io.PrintWriter; -import java.io.UncheckedIOException; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -49,6 +48,7 @@ import java.lang.ref.SoftReference; import java.lang.module.Configuration; import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.lang.reflect.Field; import java.lang.reflect.Layer; @@ -1349,10 +1349,12 @@ public final class Context { static Module createModuleTrusted(final Layer parent, final ModuleDescriptor descriptor, final ClassLoader loader) { final String mn = descriptor.name(); - final ModuleReference mref = new ModuleReference(descriptor, null, () -> { - IOException ioe = new IOException(""); - throw new UncheckedIOException(ioe); - }); + final ModuleReference mref = new ModuleReference(descriptor, null) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } + }; final ModuleFinder finder = new ModuleFinder() { @Override