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

     1.1 --- a/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java	Tue Jan 22 14:36:28 2013 +0100
     1.2 +++ b/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java	Tue Jan 22 22:07:12 2013 +0530
     1.3 @@ -83,7 +83,7 @@
     1.4      }
     1.5  
     1.6      private <V> V inGlobal(final Callable<V> callable) {
     1.7 -        final ScriptObject oldGlobal = Context.getGlobal();
     1.8 +        final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
     1.9          final boolean globalChanged = (oldGlobal != global);
    1.10          if (globalChanged) {
    1.11              NashornScriptEngine.setNashornGlobal(global);
    1.12 @@ -105,7 +105,7 @@
    1.13      @Override
    1.14      public Object call(final String methodName, final Object args[]) {
    1.15          final Object val = sobj.get(methodName);
    1.16 -        final ScriptObject oldGlobal = Context.getGlobal();
    1.17 +        final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
    1.18          final boolean globalChanged = (oldGlobal != global);
    1.19  
    1.20          if (val instanceof ScriptFunction) {
    1.21 @@ -180,7 +180,7 @@
    1.22  
    1.23      @Override
    1.24      public void setMember(final String name, final Object value) {
    1.25 -        put(name, wrap(value, Context.getGlobal()));
    1.26 +        put(name, wrap(value, NashornScriptEngine.getNashornGlobal()));
    1.27      }
    1.28  
    1.29      @Override