Mercurial > jdk8-mips64-public > nashorn / file diff

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeJavaImporter.java	Thu Jan 30 19:45:20 2014 +0530
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeJavaImporter.java	Thu Jan 30 20:14:29 2014 +0100
     1.3 @@ -33,6 +33,7 @@
     1.4  import jdk.nashorn.internal.objects.annotations.Constructor;
     1.5  import jdk.nashorn.internal.objects.annotations.Function;
     1.6  import jdk.nashorn.internal.objects.annotations.ScriptClass;
     1.7 +import jdk.nashorn.internal.runtime.Context;
     1.8  import jdk.nashorn.internal.runtime.NativeJavaPackage;
     1.9  import jdk.nashorn.internal.runtime.PropertyMap;
    1.10  import jdk.nashorn.internal.runtime.ScriptObject;
    1.11 @@ -156,8 +157,9 @@
    1.12              } else if (obj instanceof NativeJavaPackage) {
    1.13                  final String pkgName  = ((NativeJavaPackage)obj).getName();
    1.14                  final String fullName = pkgName.isEmpty() ? name : (pkgName + "." + name);
    1.15 +                final Context context = Global.instance().getContext();
    1.16                  try {
    1.17 -                    return StaticClass.forClass(Class.forName(fullName));
    1.18 +                    return StaticClass.forClass(context.findClass(fullName));
    1.19                  } catch (final ClassNotFoundException e) {
    1.20                      // IGNORE
    1.21                  }