infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-06 16:38:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8023551: Mirror functions can not be invoked using invokeMethod, invokeFunction

Browse Source 
Reviewed-by: attila, jlaskey, lagergren
This commit is contained in:
Athijegannathan Sundararajan 2013-08-22 18:46:26 +05:30
parent 2bb4ab07ca
commit cc6216ae2e
5 changed files with 91 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
View File

@ -321,10 +321,11 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
private ScriptObject getNashornGlobalFrom(final ScriptContext ctxt) {
final Bindings bindings = ctxt.getBindings(ScriptContext.ENGINE_SCOPE);
if (bindings instanceof ScriptObjectMirror) {
ScriptObject sobj = ((ScriptObjectMirror)bindings).getScriptObject();
if (sobj instanceof GlobalObject) {
return sobj;
}
final ScriptObjectMirror mirror = (ScriptObjectMirror)bindings;
ScriptObject sobj = ((ScriptObjectMirror)bindings).getScriptObject();
if (sobj instanceof GlobalObject && sobj.isOfContext(nashornContext)) {
return sobj;
}
}
// didn't find global object from context given - return the engine-wide global
@ -402,8 +403,10 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
args = ScriptRuntime.EMPTY_ARRAY;
}
// if no arguments passed, expose it
args = ((GlobalObject)ctxtGlobal).wrapAsObject(args);
ctxtGlobal.set("arguments", args, false);
if (! (args instanceof ScriptObject)) {
args = ((GlobalObject)ctxtGlobal).wrapAsObject(args);
ctxtGlobal.set("arguments", args, false);
}
}
private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException {

20
nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
View File

@ -99,12 +99,14 @@ public final class ScriptObjectMirror extends JSObject implements Bindings {
}
final Object val = functionName == null? sobj : sobj.get(functionName);
if (! (val instanceof ScriptFunction)) {
throw new NoSuchMethodException("No such function " + ((functionName != null)? functionName : ""));
if (val instanceof ScriptFunction) {
final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
return wrap(ScriptRuntime.checkAndApply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
} else if (val instanceof ScriptObjectMirror && ((ScriptObjectMirror)val).isFunction()) {
return ((ScriptObjectMirror)val).call(null, args);
}
final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
return wrap(ScriptRuntime.checkAndApply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
throw new NoSuchMethodException("No such function " + ((functionName != null)? functionName : ""));
} catch (final RuntimeException | Error e) {
throw e;
} catch (final Throwable t) {
@ -127,12 +129,14 @@ public final class ScriptObjectMirror extends JSObject implements Bindings {
}
final Object val = functionName == null? sobj : sobj.get(functionName);
if (! (val instanceof ScriptFunction)) {
throw new RuntimeException("not a constructor " + ((functionName != null)? functionName : ""));
if (val instanceof ScriptFunction) {
final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
return wrap(ScriptRuntime.checkAndConstruct((ScriptFunction)val, unwrapArray(modArgs, global)), global);
} else if (val instanceof ScriptObjectMirror && ((ScriptObjectMirror)val).isFunction()) {
return ((ScriptObjectMirror)val).newObject(null, args);
}
final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
return wrap(ScriptRuntime.checkAndConstruct((ScriptFunction)val, unwrapArray(modArgs, global)), global);
throw new RuntimeException("not a constructor " + ((functionName != null)? functionName : ""));
} catch (final RuntimeException | Error e) {
throw e;
} catch (final Throwable t) {

42
nashorn/test/script/basic/JDK-8023551.js Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright (c) 2010, 2013, 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-8023551: Mirror functions can not be invoked using invokeMethod, invokeFunction
*
* @test
* @run
*/
var m = new javax.script.ScriptEngineManager();
var e = m.getEngineByName("nashorn");
function func(x) {
print("func: " + x);
}
e.put("func", func);
e.invokeFunction("func", "hello");
var obj = e.eval("({ foo: func })");
e.invokeMethod(obj, "foo", "world");

2
nashorn/test/script/basic/JDK-8023551.js.EXPECTED Normal file
View File

@ -0,0 +1,2 @@
func: hello
func: world

26
nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
View File

@ -1256,4 +1256,30 @@ public class ScriptEngineTest {
// dos2unix - fix line endings if running on windows
assertEquals(sw.toString().replaceAll("\r", ""), "34 true hello\n");
}
@Test
public void mirrorNewObjectGlobalFunctionTest() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
final ScriptEngine e = m.getEngineByName("nashorn");
final ScriptEngine e2 = m.getEngineByName("nashorn");
e.eval("function func() {}");
e2.put("foo", e.get("func"));
final Object e2global = e2.eval("this");
final Object newObj = ((ScriptObjectMirror)e2global).newObject("foo");
assertTrue(newObj instanceof ScriptObjectMirror);
}
@Test
public void mirrorNewObjectInstanceFunctionTest() throws ScriptException {
final ScriptEngineManager m = new ScriptEngineManager();
final ScriptEngine e = m.getEngineByName("nashorn");
final ScriptEngine e2 = m.getEngineByName("nashorn");
e.eval("function func() {}");
e2.put("func", e.get("func"));
final Object e2obj = e2.eval("({ foo: func })");
final Object newObj = ((ScriptObjectMirror)e2obj).newObject("foo");
assertTrue(newObj instanceof ScriptObjectMirror);
}
}