Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeObject.java	Mon Aug 12 17:08:01 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeObject.java	Mon Aug 12 18:16:28 2013 +0530
     1.3 @@ -113,6 +113,13 @@
     1.4          } else if (obj instanceof ScriptObjectMirror) {
     1.5              return ((ScriptObjectMirror)obj).getProto();
     1.6          } else {
     1.7 +            final JSType type = JSType.of(obj);
     1.8 +            if (type == JSType.OBJECT) {
     1.9 +                // host (Java) objects have null __proto__
    1.10 +                return null;
    1.11 +            }
    1.12 +
    1.13 +            // must be some JS primitive
    1.14              throw notAnObject(obj);
    1.15          }
    1.16      }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8022598.js	Mon Aug 12 18:16:28 2013 +0530
     2.3 @@ -0,0 +1,56 @@
     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-8022598: Object.getPrototypeOf should return null for host objects rather than throwing TypeError
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +// the following should not throw TypeError, just return null instead
    2.35 +
    2.36 +var proto = Object.getPrototypeOf(new java.lang.Object());
    2.37 +if (proto !== null) {
    2.38 +    fail("Expected 'null' __proto__ for host objects");
    2.39 +}
    2.40 +
    2.41 +// on primitive should result in TypeError
    2.42 +
    2.43 +function checkTypeError(obj) {
    2.44 +    try {
    2.45 +        Object.getPrototypeOf(obj);
    2.46 +        fail("Expected TypeError for Object.getPrototypeOf on " + obj);
    2.47 +    } catch (e) {
    2.48 +        if (! (e instanceof TypeError)) {
    2.49 +            fail("Expected TypeError, but got " + e);
    2.50 +        }
    2.51 +    }
    2.52 +}
    2.53 +
    2.54 +checkTypeError(undefined);
    2.55 +checkTypeError(null);
    2.56 +checkTypeError(3.1415);
    2.57 +checkTypeError("hello");
    2.58 +checkTypeError(false);
    2.59 +checkTypeError(true);