# HG changeset patch # User sundar # Date 1365063891 -19800 # Node ID 0548c134b9ac6a02ecaa25893bbedf2c6b625020 # Parent a5a8ddc2e028678b2e29c468823a45fadda25645 8011421: When using Object.defineProperty on arrays, PropertyDescriptor's property accessors are invoked multiple times Reviewed-by: lagergren, hannesw diff -r a5a8ddc2e028 -r 0548c134b9ac src/jdk/nashorn/internal/objects/NativeArray.java --- a/src/jdk/nashorn/internal/objects/NativeArray.java Thu Apr 04 10:24:46 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java Thu Apr 04 13:54:51 2013 +0530 @@ -160,7 +160,7 @@ if ("length".equals(key)) { // Step 3a if (!desc.has(VALUE)) { - return super.defineOwnProperty("length", propertyDesc, reject); + return super.defineOwnProperty("length", desc, reject); } // Step 3b @@ -242,7 +242,7 @@ // Step 4c // set the new array element - final boolean succeeded = super.defineOwnProperty(key, propertyDesc, false); + final boolean succeeded = super.defineOwnProperty(key, desc, false); // Step 4d if (!succeeded) { @@ -263,7 +263,7 @@ } // not an index property - return super.defineOwnProperty(key, propertyDesc, reject); + return super.defineOwnProperty(key, desc, reject); } /** diff -r a5a8ddc2e028 -r 0548c134b9ac test/script/basic/JDK-8011421.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8011421.js Thu Apr 04 13:54:51 2013 +0530 @@ -0,0 +1,51 @@ +/* + * 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-8011421: When using Object.defineProperty on arrays, PropertyDescriptor's property accessors are invoked multiple times + * + * @test + * @run + */ + +var configurableGetterCalled = 0; + +// create a property descriptor object with "configurable" +// property with a user defined getter +var propDesc = Object.defineProperty({}, + "configurable", + { + get: function() { + configurableGetterCalled++; + return false + } + } +); + +// make array length non-configurable +Object.defineProperty([], "length", propDesc); + +// above should have called "configurable" getter only once +if (configurableGetterCalled !== 1) { + fail("defineProperty on array should call propDesc getters only once"); +}