提交 128927e4 编写于 作者: M malenkov

6707231: Wrong read Method returned for boolen properties

Reviewed-by: alexsch
上级 abb6cf64
...@@ -652,11 +652,12 @@ public class Introspector { ...@@ -652,11 +652,12 @@ public class Introspector {
} }
} else { } else {
if (pd.getReadMethod() != null) { if (pd.getReadMethod() != null) {
String pdName = pd.getReadMethod().getName();
if (gpd != null) { if (gpd != null) {
// Don't replace the existing read // Don't replace the existing read
// method if it starts with "is" // method if it starts with "is"
Method method = gpd.getReadMethod(); String gpdName = gpd.getReadMethod().getName();
if (!method.getName().startsWith(IS_PREFIX)) { if (gpdName.equals(pdName) || !gpdName.startsWith(IS_PREFIX)) {
gpd = new PropertyDescriptor(gpd, pd); gpd = new PropertyDescriptor(gpd, pd);
} }
} else { } else {
......
/*
* Copyright (c) 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.
*/
import java.beans.PropertyDescriptor;
/*
* @test
* @bug 6707231
* @summary Tests the boolean getter
* @author Sergey Malenkov
*/
public class Test6707231 {
public static void main(String[] args) throws Exception {
test(Bean.class, Bean.class);
test(Public.class, Public.class);
test(Private.class, Bean.class);
}
public static class Bean {
private boolean value;
public boolean isValue() {
return this.value;
}
public void setValue(boolean value) {
this.value = value;
}
}
public static class Public extends Bean {
public boolean isValue() {
return super.isValue();
}
public void setValue(boolean value) {
super.setValue(value);
}
}
private static class Private extends Bean {
public boolean isValue() {
return super.isValue();
}
public void setValue(boolean value) {
super.setValue(value);
}
}
private static void test(Class<?> actual, Class<?> expected) {
PropertyDescriptor pd = BeanUtils.getPropertyDescriptor(actual, "value");
Class<?> getter = pd.getReadMethod().getDeclaringClass();
Class<?> setter = pd.getWriteMethod().getDeclaringClass();
if ((getter != expected) || (setter != expected)) {
throw new Error(actual.getName());
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册