infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 17:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2015-12-24 10:33:11 -08:00
commit f2b6ce04e4
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java
View File

@ -790,7 +790,7 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
*/
@SuppressWarnings("unused")
private Object getPropertyGetterHandle(final Object id) {
return propertyGetters.get(id);
return propertyGetters.get(String.valueOf(id));
}
// Type is MethodHandle(BeanLinker, MethodType, LinkerServices, Object, String, Object), of which the two "Object"

49
nashorn/test/script/basic/JDK-8146147.js Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 2015, 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-8146147: Java linker indexed property getter does not work for computed nashorn string
*
* @test
* @run
*/
var locale = java.util.Locale.ENGLISH;
var prop = 'ISO3Language';
var prop1 = 'ISO3';
var prop2 = prop1 + 'Language';
var prop3 = String(prop2);
function checkLang(obj) {
if (obj != "eng") {
throw new Error("FAILED: expected 'eng', got " + obj);
}
}
checkLang(locale.ISO3Language);
checkLang(locale['ISO3Language']);
checkLang(locale[prop]);
checkLang(locale[prop1 + 'Language']);
checkLang(locale[prop2]);
checkLang(locale[prop3]);
checkLang(locale[String(prop1 + 'Language')]);