infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8011421: When using Object.defineProperty on arrays, PropertyDescriptor's property accessors are invoked multiple times

Browse Source 
Reviewed-by: lagergren, hannesw
This commit is contained in:
Athijegannathan Sundararajan 2013-04-04 13:54:51 +05:30
parent 2b494aafd9
commit e20dc52ab2
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
View File

@ -160,7 +160,7 @@ public final class NativeArray extends ScriptObject {
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 @@ public final class NativeArray extends ScriptObject {
// 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 @@ public final class NativeArray extends ScriptObject {
}
// not an index property
return super.defineOwnProperty(key, propertyDesc, reject);
return super.defineOwnProperty(key, desc, reject);
}
/**

51
nashorn/test/script/basic/JDK-8011421.js Normal file
View File

@ -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");
}