Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 206:ac309d492b8d
8012462: Date.prototype.toJSON does not handle non-Date 'this' as per the spec.
Reviewed-by: jlaskey, hannesw
author | sundar |
---|---|
date | Thu, 18 Apr 2013 15:50:30 +0530 |
parents | 04b36c02c0e2 |
children | d1d564f5cf82 |
files | src/jdk/nashorn/internal/objects/NativeDate.java test/script/basic/JDK-8012462.js |
diffstat | 2 files changed, 52 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/objects/NativeDate.java Wed Apr 17 15:36:48 2013 -0300 +++ b/src/jdk/nashorn/internal/objects/NativeDate.java Thu Apr 18 15:50:30 2013 +0530 @@ -851,11 +851,11 @@ } final ScriptObject sobj = (ScriptObject)selfObj; final Object value = sobj.getDefaultValue(Number.class); - - final double num = (value instanceof Number) ? ((Number)value).doubleValue() : NaN; - - if (isInfinite(num) || isNaN(num)) { - return null; + if (value instanceof Number) { + final double num = ((Number)value).doubleValue(); + if (isInfinite(num) || isNaN(num)) { + return null; + } } try {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8012462.js Thu Apr 18 15:50:30 2013 +0530 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8012462: Date.prototype.toJSON does not handle non-Date 'this' as per the spec. + * + * @test + * @run + */ + +var toJSON = Date.prototype.toJSON; + +function checkJSON(value, expected) { + var res = toJSON.call({ + valueOf: function() { return value; }, + toISOString: function() { return value; } + }); + + if (res !== expected) { + fail("Date.prototype.toJSON does not work for non-Date 'this'"); + } +} + +checkJSON(NaN, null); +checkJSON(-Infinity, null); +checkJSON(Infinity, null); +checkJSON("foo", "foo");