Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Wed Apr 10 14:08:00 2013 +0200
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Thu Apr 11 13:20:03 2013 +0530
     1.3 @@ -793,11 +793,15 @@
     1.4      }
     1.5  
     1.6      private static ScriptFunction compareFunction(final Object comparefn) {
     1.7 -        try {
     1.8 -            return (ScriptFunction)comparefn;
     1.9 -        } catch (final ClassCastException e) {
    1.10 -            return null; //undefined or null
    1.11 +        if (comparefn == ScriptRuntime.UNDEFINED) {
    1.12 +            return null;
    1.13          }
    1.14 +
    1.15 +        if (! (comparefn instanceof ScriptFunction)) {
    1.16 +            throw typeError("not.a.function", ScriptRuntime.safeToString(comparefn));
    1.17 +        }
    1.18 +
    1.19 +        return (ScriptFunction)comparefn;
    1.20      }
    1.21  
    1.22      private static Object[] sort(final Object[] array, final Object comparefn) {

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8011960.js	Thu Apr 11 13:20:03 2013 +0530
     2.3 @@ -0,0 +1,53 @@
     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-8011960: [2,1].sort(null) should throw TypeError
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +function check(func) {
    2.35 +    try {
    2.36 +        [2,1].sort(func);
    2.37 +        fail("should have thrown TypeError for :" + func);
    2.38 +    } catch (e) {
    2.39 +        if (! (e instanceof TypeError)) {
    2.40 +            fail("TypeError not thrown for sort comparefn: " + func);
    2.41 +        }
    2.42 +    }
    2.43 +}
    2.44 +
    2.45 +// should not result in TypeError for undefined
    2.46 +[1, 2].sort(undefined);
    2.47 +
    2.48 +// TypeError for null
    2.49 +check(null);
    2.50 +
    2.51 +// should result in TypeError other non-callable params
    2.52 +check(32);
    2.53 +check("foo");
    2.54 +check(false);
    2.55 +check({});
    2.56 +check([]);