From 67e147ab346bd7c95061d0f6a71bf5db7a443b0b Mon Sep 17 00:00:00 2001 From: malenkov Date: Tue, 31 Jan 2012 14:20:47 +0400 Subject: [PATCH] 7122138: IAE thrown because Introspector ignores synthetic methods Reviewed-by: rupashka --- .../classes/java/beans/Introspector.java | 2 +- .../java/beans/PropertyDescriptor.java | 35 ++++++++++++++- .../Introspector/7122138/Test7122138.java | 45 +++++++++++++++++++ .../beans/Introspector/7122138/pack/Sub.java | 4 ++ .../Introspector/7122138/pack/Super.java | 14 ++++++ 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 test/java/beans/Introspector/7122138/Test7122138.java create mode 100644 test/java/beans/Introspector/7122138/pack/Sub.java create mode 100644 test/java/beans/Introspector/7122138/pack/Super.java diff --git a/src/share/classes/java/beans/Introspector.java b/src/share/classes/java/beans/Introspector.java index 573420810..476adf079 100644 --- a/src/share/classes/java/beans/Introspector.java +++ b/src/share/classes/java/beans/Introspector.java @@ -473,7 +473,7 @@ public class Introspector { // Now analyze each method. for (int i = 0; i < methodList.length; i++) { Method method = methodList[i]; - if (method == null || method.isSynthetic()) { + if (method == null) { continue; } // skip static methods. diff --git a/src/share/classes/java/beans/PropertyDescriptor.java b/src/share/classes/java/beans/PropertyDescriptor.java index 6abe8a0bd..5d548309b 100644 --- a/src/share/classes/java/beans/PropertyDescriptor.java +++ b/src/share/classes/java/beans/PropertyDescriptor.java @@ -559,7 +559,7 @@ public class PropertyDescriptor extends FeatureDescriptor { // Normally give priority to y's readMethod. try { - if (yr != null && yr.getDeclaringClass() == getClass0()) { + if (isAssignable(xr, yr)) { setReadMethod(yr); } else { setReadMethod(xr); @@ -713,4 +713,37 @@ public class PropertyDescriptor extends FeatureDescriptor { appendTo(sb, "readMethod", this.readMethodRef); appendTo(sb, "writeMethod", this.writeMethodRef); } + + private boolean isAssignable(Method m1, Method m2) { + if (m1 == null) { + return true; // choose second method + } + if (m2 == null) { + return false; // choose first method + } + if (!m1.getName().equals(m2.getName())) { + return true; // choose second method by default + } + Class type1 = m1.getDeclaringClass(); + Class type2 = m2.getDeclaringClass(); + if (!type1.isAssignableFrom(type2)) { + return false; // choose first method: it declared later + } + type1 = getReturnType(getClass0(), m1); + type2 = getReturnType(getClass0(), m2); + if (!type1.isAssignableFrom(type2)) { + return false; // choose first method: it overrides return type + } + Class[] args1 = getParameterTypes(getClass0(), m1); + Class[] args2 = getParameterTypes(getClass0(), m2); + if (args1.length != args2.length) { + return true; // choose second method by default + } + for (int i = 0; i < args1.length; i++) { + if (!args1[i].isAssignableFrom(args2[i])) { + return false; // choose first method: it overrides parameter + } + } + return true; // choose second method + } } diff --git a/test/java/beans/Introspector/7122138/Test7122138.java b/test/java/beans/Introspector/7122138/Test7122138.java new file mode 100644 index 000000000..6832304d0 --- /dev/null +++ b/test/java/beans/Introspector/7122138/Test7122138.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2012, 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. + */ + +/* + * @test + * @bug 7122138 + * @summary Tests generic methods reflection + * @author Sergey Malenkov + * @library .. + */ + +import pack.Sub; + +public class Test7122138 { + + public static void main(String[] args) throws Exception { + Class type = Sub.class; + Sub object = type.newInstance(); + String name = "name"; + BeanUtils.getPropertyDescriptor(type, name).getWriteMethod().invoke(object, name); + if (!name.equals(object.getName())) { + throw new Error("name is not set"); + } + } +} diff --git a/test/java/beans/Introspector/7122138/pack/Sub.java b/test/java/beans/Introspector/7122138/pack/Sub.java new file mode 100644 index 000000000..b30d13224 --- /dev/null +++ b/test/java/beans/Introspector/7122138/pack/Sub.java @@ -0,0 +1,4 @@ +package pack; + +public class Sub extends Super { +} diff --git a/test/java/beans/Introspector/7122138/pack/Super.java b/test/java/beans/Introspector/7122138/pack/Super.java new file mode 100644 index 000000000..77359680d --- /dev/null +++ b/test/java/beans/Introspector/7122138/pack/Super.java @@ -0,0 +1,14 @@ +package pack; + +class Super { + + T name; + + public void setName(T name) { + this.name = name; + } + + public T getName() { + return name; + } +} -- GitLab