Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java	Wed Dec 17 10:43:47 2014 -0800
     1.2 +++ b/src/jdk/nashorn/internal/runtime/linker/BoundCallableLinker.java	Thu Dec 18 16:33:33 2014 +0530
     1.3 @@ -99,7 +99,7 @@
     1.4          MethodType newMethodType = descriptor.getMethodType().changeParameterType(0, callable.getClass());
     1.5          if (isCall) {
     1.6              // R(callable.class, T1, ...) => R(callable.class, boundThis.class, ...)
     1.7 -            newMethodType = newMethodType.changeParameterType(1, boundThis.getClass());
     1.8 +            newMethodType = newMethodType.changeParameterType(1, boundThis == null? Object.class : boundThis.getClass());
     1.9          }
    1.10          // R(callable.class[, boundThis.class], T2, ...) => R(callable.class[, boundThis.class], boundArg0.class, ..., boundArgn.class, T2, ...)
    1.11          for(int i = boundArgs.length; i-- > 0;) {

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/trusted/JDK-8067854.js	Thu Dec 18 16:33:33 2014 +0530
     2.3 @@ -0,0 +1,39 @@
     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-8067854: bound java static method throws NPE when 'null' is used for this argument
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +getProp = java.lang.System.getProperty;
    2.35 +
    2.36 +// bind this and an argument. "null" for this as getProperty is a
    2.37 +// static method of java.lang.System
    2.38 +getHome = Function.prototype.bind.call(getProp, null, "java.home");
    2.39 +
    2.40 +if (getHome() != getProp("java.home")) {
    2.41 +    fail("getHome() failed to get java.home");
    2.42 +}