Mercurial > hg > icedtea8-forest > nashorn
changeset 1737:07db58f99673 jdk8u76-b03
Merge
author | asaha |
---|---|
date | Fri, 15 Jan 2016 16:24:44 -0800 |
parents | 773d7b00d00d (current diff) a6dceee02cbc (diff) |
children | 20c9a3e8bbc0 |
files | |
diffstat | 2 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Tue Jan 05 08:54:00 2016 -0800 +++ b/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java Fri Jan 15 16:24:44 2016 -0800 @@ -782,7 +782,7 @@ */ @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"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8146147.js Fri Jan 15 16:24:44 2016 -0800 @@ -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')]);