--- old/src/java.base/share/classes/java/lang/Class.java	2017-03-21 13:43:52.116673037 +0000
+++ new/src/java.base/share/classes/java/lang/Class.java	2017-03-21 13:43:51.914659175 +0000
@@ -64,9 +64,9 @@
 import jdk.internal.HotSpotIntrinsicCandidate;
 import jdk.internal.loader.BootLoader;
 import jdk.internal.loader.BuiltinClassLoader;
-import jdk.internal.loader.ResourceHelper;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.misc.VM;
+import jdk.internal.module.Resources;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.ConstantPool;
 import jdk.internal.reflect.Reflection;
@@ -2563,11 +2563,11 @@
 
         Module module = getModule();
         if (module.isNamed()) {
-            if (!ResourceHelper.isSimpleResource(name)) {
+            if (Resources.canEncapsulate(name)) {
                 Module caller = Reflection.getCallerClass().getModule();
                 if (caller != module) {
                     Set<String> packages = module.getDescriptor().packages();
-                    String pn = ResourceHelper.getPackageName(name);
+                    String pn = Resources.toPackageName(name);
                     if (packages.contains(pn) && !module.isOpen(pn, caller)) {
                         // resource is in package not open to caller
                         return null;
@@ -2665,11 +2665,11 @@
 
         Module module = getModule();
         if (module.isNamed()) {
-            if (!ResourceHelper.isSimpleResource(name)) {
+            if (Resources.canEncapsulate(name)) {
                 Module caller = Reflection.getCallerClass().getModule();
                 if (caller != module) {
                     Set<String> packages = module.getDescriptor().packages();
-                    String pn = ResourceHelper.getPackageName(name);
+                    String pn = Resources.toPackageName(name);
                     if (packages.contains(pn) && !module.isOpen(pn, caller)) {
                         // resource is in package not open to caller
                         return null;