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

     1.1 --- a/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Mon Jan 28 18:10:16 2013 +0530
     1.2 +++ b/src/jdk/nashorn/api/scripting/NashornScriptEngine.java	Mon Jan 28 21:29:05 2013 +0530
     1.3 @@ -74,27 +74,18 @@
     1.4      // default options passed to Nashorn Options object
     1.5      private static final String[] DEFAULT_OPTIONS = new String[] { "-scripting", "-af", "-doe" };
     1.6  
     1.7 -    NashornScriptEngine(final NashornScriptEngineFactory factory) {
     1.8 -        this(factory, DEFAULT_OPTIONS);
     1.9 +    NashornScriptEngine(final NashornScriptEngineFactory factory, final ClassLoader appLoader) {
    1.10 +        this(factory, DEFAULT_OPTIONS, appLoader);
    1.11      }
    1.12  
    1.13      @SuppressWarnings("LeakingThisInConstructor")
    1.14 -    NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args) {
    1.15 +    NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args, final ClassLoader appLoader) {
    1.16          this.factory = factory;
    1.17          final Options options = new Options("nashorn");
    1.18          options.process(args);
    1.19  
    1.20          // throw ParseException on first error from script
    1.21          final ErrorManager errMgr = new Context.ThrowErrorManager();
    1.22 -        // application loader for the context
    1.23 -        ClassLoader tmp;
    1.24 -        try {
    1.25 -            tmp = Thread.currentThread().getContextClassLoader();
    1.26 -        } catch (final SecurityException se) {
    1.27 -            tmp = null;
    1.28 -        }
    1.29 -        final ClassLoader appLoader = tmp;
    1.30 -
    1.31          // create new Nashorn Context
    1.32          this.nashornContext = AccessController.doPrivileged(new PrivilegedAction<Context>() {
    1.33              @Override