Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Wed Oct 09 10:47:47 2013 +0200
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Wed Oct 09 13:26:23 2013 +0200
     1.3 @@ -851,6 +851,10 @@
     1.4      @Function(attributes = Attribute.NOT_ENUMERABLE)
     1.5      public static Object slice(final Object self, final Object start, final Object end) {
     1.6          final Object       obj                 = Global.toObject(self);
     1.7 +        if (!(obj instanceof ScriptObject)) {
     1.8 +            return ScriptRuntime.UNDEFINED;
     1.9 +        }
    1.10 +
    1.11          final ScriptObject sobj                = (ScriptObject)obj;
    1.12          final long         len                 = JSType.toUint32(sobj.getLength());
    1.13          final long         relativeStart       = JSType.toLong(start);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8026125.js	Wed Oct 09 13:26:23 2013 +0200
     2.3 @@ -0,0 +1,32 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, 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-8026125: Array.prototype.slice.call(Java.type("java.util.HashMap")) throws ClassCastException: jdk.internal.dynalink.beans.StaticClass cannot be cast to jdk.nashorn.internal.runtime.ScriptObject
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +Array.prototype.splice.call(Java.type("java.util.HashMap"))
    2.35 +Array.prototype.slice.call(Java.type("java.util.HashMap"))