Wed, 14 Jan 2015 18:25:01 +0100
8069002: NPE on invoking null (8068889 regression)
Reviewed-by: jlaskey, sundar
src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java | file | annotate | diff | comparison | revisions | |
test/script/basic/JDK-8069002.js | file | annotate | diff | comparison | revisions |
1.1 --- a/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java Tue Jan 13 16:38:29 2015 +0100 1.2 +++ b/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java Wed Jan 14 18:25:01 2015 +0100 1.3 @@ -101,7 +101,7 @@ 1.4 return invocation == null ? null : invocation.filterArguments(0, FILTER_CONSSTRING); 1.5 } 1.6 1.7 - if ("call".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) { 1.8 + if (self != null && "call".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) { 1.9 // Support dyn:call on any object that supports some @FunctionalInterface 1.10 // annotated interface. This way Java method, constructor references or 1.11 // implementations of java.util.function.* interfaces can be called as though
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/script/basic/JDK-8069002.js Wed Jan 14 18:25:01 2015 +0100 2.3 @@ -0,0 +1,35 @@ 2.4 +/* 2.5 + * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + */ 2.26 + 2.27 +/** 2.28 + * JDK-8069002: NPE on invoking null (8068889 regression) 2.29 + * 2.30 + * @test 2.31 + * @run 2.32 + */ 2.33 + 2.34 +try { 2.35 + null(); 2.36 +} catch (e) { 2.37 + Assert.assertTrue(e instanceof TypeError); 2.38 +}