Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeError.java	Mon Sep 30 18:09:33 2013 -0300
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeError.java	Tue Oct 01 14:38:56 2013 +0530
     1.3 @@ -37,10 +37,12 @@
     1.4  import jdk.nashorn.internal.objects.annotations.Property;
     1.5  import jdk.nashorn.internal.objects.annotations.ScriptClass;
     1.6  import jdk.nashorn.internal.objects.annotations.Where;
     1.7 +import jdk.nashorn.internal.objects.ScriptFunctionImpl;
     1.8  import jdk.nashorn.internal.runtime.ECMAException;
     1.9  import jdk.nashorn.internal.runtime.JSType;
    1.10  import jdk.nashorn.internal.runtime.PropertyMap;
    1.11  import jdk.nashorn.internal.runtime.ScriptObject;
    1.12 +import jdk.nashorn.internal.runtime.ScriptFunction;
    1.13  import jdk.nashorn.internal.runtime.ScriptRuntime;
    1.14  
    1.15  /**
    1.16 @@ -138,7 +140,10 @@
    1.17          Global.checkObject(errorObj);
    1.18          final ScriptObject sobj = (ScriptObject)errorObj;
    1.19          final ECMAException exp = new ECMAException(sobj, null);
    1.20 -        sobj.set("stack", getScriptStackString(sobj, exp), false);
    1.21 +        sobj.delete("stack", false);
    1.22 +        final ScriptFunction getStack = ScriptFunctionImpl.makeFunction("getStack", GET_STACK);
    1.23 +        final ScriptFunction setStack = ScriptFunctionImpl.makeFunction("setStack", SET_STACK);
    1.24 +        sobj.addOwnProperty("stack", Attribute.NOT_ENUMERABLE, getStack, setStack);
    1.25          return UNDEFINED;
    1.26      }
    1.27  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8025488.js	Tue Oct 01 14:38:56 2013 +0530
     2.3 @@ -0,0 +1,43 @@
     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-8025488: Error.captureStackTrace should not format error stack
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +
    2.35 +function MyError () {
    2.36 +    Error.call(this);
    2.37 +    Error.captureStackTrace(this);
    2.38 +    this.arr = {};
    2.39 +};
    2.40 +
    2.41 +MyError.prototype.toString = function() {
    2.42 +    return this.arr.toString();
    2.43 +}
    2.44 +
    2.45 +var e = new MyError(); 
    2.46 +print(e.stack);

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8025488.js.EXPECTED	Tue Oct 01 14:38:56 2013 +0530
     3.3 @@ -0,0 +1,3 @@
     3.4 +[object Object]
     3.5 +	at MyError (test/script/basic/JDK-8025488.js:34)
     3.6 +	at <program> (test/script/basic/JDK-8025488.js:42)