Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 5536:6d4f9b2e4a51 icedtea-2.3.3
Remove merge artefact.
author | andrew |
---|---|
date | Mon, 15 Oct 2012 11:17:27 +0100 |
parents | a0ae1a8c83e0 |
children | 5ec94d162f05 |
files | src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java |
diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java Wed Sep 19 12:21:24 2012 -0700 +++ b/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java Mon Oct 15 11:17:27 2012 +0100 @@ -153,10 +153,6 @@ } } - if (System.getSecurityManager() != null) { - accCtxt = AccessController.getContext(); - } - Context cx = enterContext(); try { topLevel = new RhinoTopLevel(cx, this);