Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > nashorn
changeset 57:ca6d5e4b8170
8007132: Java objects returned from constructor functions are lost
Reviewed-by: hannesw, lagergren, attila
author | sundar |
---|---|
date | Wed, 30 Jan 2013 17:52:54 +0530 |
parents | 59970b70ebb5 |
children | 9f913c1843c8 |
files | src/jdk/nashorn/internal/runtime/ScriptFunction.java test/script/basic/JDK-8007132.js |
diffstat | 2 files changed, 55 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/ScriptFunction.java Wed Jan 30 12:26:45 2013 +0100 +++ b/src/jdk/nashorn/internal/runtime/ScriptFunction.java Wed Jan 30 17:52:54 2013 +0530 @@ -892,7 +892,7 @@ @SuppressWarnings("unused") private static Object newFilter(final Object result, final Object allocation) { - return result instanceof ScriptObject ? result : allocation; + return (result instanceof ScriptObject || !JSType.isPrimitive(result))? result : allocation; } /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8007132.js Wed Jan 30 17:52:54 2013 +0530 @@ -0,0 +1,54 @@ +/* + * 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-8007232: Java objects returned from constructor functions are lost + * + * @test + * @run + */ + +function Func() { + return new java.util.HashMap(); +} + +var f = new Func(); +if (! (f instanceof java.util.Map)) { + fail("instance of java.util.Map expected") +} + +function check(obj) { + if (typeof obj != 'object') { + fail("expected 'object' but got " + (typeof obj)); + } +} + +// check primitive returning constructors +check(new (function() { return 22; })); +check(new (function() { return false })); +check(new (function() { return "hello" })); + +// check null and undefined returning constructors +check(new (function() { return null; })); +check(new (function() { return undefined; }));