Mercurial > jdk8-mips64-public > nashorn / file comparison
comparison: src/jdk/nashorn/internal/runtime/Context.java
src/jdk/nashorn/internal/runtime/Context.java
- changeset 322
- 62b096f7bac3
- parent 319
- 0946c8a60f39
- child 325
- 9374c04f38fe
equal
deleted
inserted
replaced
| 321:c70f60578385 | 322:62b096f7bac3 |
|---|---|
| 46 import java.security.Permissions; | 46 import java.security.Permissions; |
| 47 import java.security.PrivilegedAction; | 47 import java.security.PrivilegedAction; |
| 48 import java.security.ProtectionDomain; | 48 import java.security.ProtectionDomain; |
| 49 import jdk.internal.org.objectweb.asm.ClassReader; | 49 import jdk.internal.org.objectweb.asm.ClassReader; |
| 50 import jdk.internal.org.objectweb.asm.util.CheckClassAdapter; | 50 import jdk.internal.org.objectweb.asm.util.CheckClassAdapter; |
| 51 import jdk.nashorn.api.scripting.ScriptObjectMirror; | |
| 51 import jdk.nashorn.internal.codegen.Compiler; | 52 import jdk.nashorn.internal.codegen.Compiler; |
| 52 import jdk.nashorn.internal.codegen.ObjectClassGenerator; | 53 import jdk.nashorn.internal.codegen.ObjectClassGenerator; |
| 53 import jdk.nashorn.internal.ir.FunctionNode; | 54 import jdk.nashorn.internal.ir.FunctionNode; |
| 54 import jdk.nashorn.internal.ir.debug.ASTWriter; | 55 import jdk.nashorn.internal.ir.debug.ASTWriter; |
| 55 import jdk.nashorn.internal.ir.debug.PrintVisitor; | 56 import jdk.nashorn.internal.ir.debug.PrintVisitor; |
| 516 } | 517 } |
| 517 }); | 518 }); |
| 518 setGlobalTrusted(newGlobal); | 519 setGlobalTrusted(newGlobal); |
| 519 | 520 |
| 520 try { | 521 try { |
| 521 return load(newGlobal, from); | 522 return ScriptObjectMirror.wrap(load(newGlobal, from), newGlobal); |
| 522 } finally { | 523 } finally { |
| 523 setGlobalTrusted(oldGlobal); | 524 setGlobalTrusted(oldGlobal); |
| 524 } | 525 } |
| 525 } | 526 } |
| 526 | 527 |
