Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1291:456ffec2b5ae
8081156: jjs "nashorn.args" system property is not effective when script arguments are passed
Reviewed-by: hannesw, lagergren
author | sundar |
---|---|
date | Wed, 27 May 2015 22:18:51 +0530 |
parents | cdec24430159 |
children | f822b749821e |
files | src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java test/script/basic/JDK-8081156.js |
diffstat | 2 files changed, 54 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java Wed May 27 14:37:11 2015 +0300 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java Wed May 27 22:18:51 2015 +0530 @@ -424,9 +424,17 @@ public void process(final String[] args) { final LinkedList<String> argList = new LinkedList<>(); addSystemProperties(NASHORN_ARGS_PREPEND_PROPERTY, argList); + processArgList(argList); + assert argList.isEmpty(); Collections.addAll(argList, args); + processArgList(argList); + assert argList.isEmpty(); addSystemProperties(NASHORN_ARGS_PROPERTY, argList); + processArgList(argList); + assert argList.isEmpty(); + } + private void processArgList(final LinkedList<String> argList) { while (!argList.isEmpty()) { final String arg = argList.remove(0); Objects.requireNonNull(arg);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8081156.js Wed May 27 22:18:51 2015 +0530 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8081156: jjs "nashorn.args" system property is not effective when script arguments are passed + * + * @test + * @fork + * @option -Dnashorn.args=-strict + * @argument foo + * @argument bar + * @run + */ + +try { + x = 14; + throw new Error("should have thrown ReferenceError"); +} catch (e) { + if (! (e instanceof ReferenceError)) { + throw e; + } +} + +Assert.assertTrue(arguments.length == 2); +Assert.assertTrue(arguments[0] == "foo"); +Assert.assertTrue(arguments[1] == "bar");