8027648: Type of overridden property is resolved incorrectly
Reviewed-by: alexsch
--- a/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java Thu Nov 07 18:57:54 2013 +0400
+++ b/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java Fri Nov 08 14:09:18 2013 +0400
@@ -373,12 +373,13 @@
if (params[0] != Integer.TYPE) {
throw new IntrospectionException("non int index to indexed write method");
}
- if (indexedPropertyType != null && indexedPropertyType != params[1]) {
+ if (indexedPropertyType == null || params[1].isAssignableFrom(indexedPropertyType)) {
+ indexedPropertyType = params[1];
+ } else if (!indexedPropertyType.isAssignableFrom(params[1])) {
throw new IntrospectionException(
"type mismatch between indexed read and indexed write methods: "
+ getName());
}
- indexedPropertyType = params[1];
}
Class<?> propertyType = getPropertyType();
if (propertyType != null && (!propertyType.isArray() ||
--- a/jdk/src/share/classes/java/beans/Introspector.java Thu Nov 07 18:57:54 2013 +0400
+++ b/jdk/src/share/classes/java/beans/Introspector.java Fri Nov 08 14:09:18 2013 +0400
@@ -684,8 +684,7 @@
ipd = (IndexedPropertyDescriptor)pd;
if (ipd.getIndexedWriteMethod() != null) {
if (igpd != null) {
- if (igpd.getIndexedPropertyType()
- == ipd.getIndexedPropertyType()) {
+ if (isAssignable(igpd.getIndexedPropertyType(), ipd.getIndexedPropertyType())) {
if (ispd != null) {
ispd = new IndexedPropertyDescriptor(ispd, ipd);
} else {
@@ -703,7 +702,7 @@
} else {
if (pd.getWriteMethod() != null) {
if (gpd != null) {
- if (gpd.getPropertyType() == pd.getPropertyType()) {
+ if (isAssignable(gpd.getPropertyType(), pd.getPropertyType())) {
if (spd != null) {
spd = new PropertyDescriptor(spd, pd);
} else {
@@ -806,6 +805,10 @@
}
}
+ private static boolean isAssignable(Class<?> current, Class<?> candidate) {
+ return current == null ? candidate == null : current.isAssignableFrom(candidate);
+ }
+
/**
* Adds the property descriptor to the indexedproperty descriptor only if the
* types are the same.
--- a/jdk/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java Thu Nov 07 18:57:54 2013 +0400
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java Fri Nov 08 14:09:18 2013 +0400
@@ -26,6 +26,7 @@
package javax.swing.tree;
// ISSUE: this class depends on nothing in AWT -- move to java.util?
+import java.beans.Transient;
import java.io.*;
import java.util.*;
@@ -215,6 +216,7 @@
*
* @param newParent this node's new parent
*/
+ @Transient
public void setParent(MutableTreeNode newParent) {
parent = newParent;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/Test8027648.java Fri Nov 08 14:09:18 2013 +0400
@@ -0,0 +1,97 @@
+/*
+ * 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.IndexedPropertyDescriptor;
+import java.beans.PropertyDescriptor;
+
+/*
+ * @test
+ * @bug 8027648
+ * @summary Tests overridden getter and overloaded setter
+ * @author Sergey Malenkov
+ */
+
+public class Test8027648 {
+
+ public static void main(String[] args) {
+ test(false);
+ test(true);
+ }
+
+ private static void test(boolean indexed) {
+ Class<?> parent = getPropertyType(BaseBean.class, indexed);
+ Class<?> child = getPropertyType(MyBean.class, indexed);
+ if (parent.equals(child) || !parent.isAssignableFrom(child)) {
+ throw new Error("the child property type is not override the parent property type");
+ }
+ }
+
+ private static Class<?> getPropertyType(Class<?> type, boolean indexed) {
+ PropertyDescriptor pd = BeanUtils.findPropertyDescriptor(type, indexed ? "index" : "value");
+ if (pd instanceof IndexedPropertyDescriptor) {
+ IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+ return ipd.getIndexedPropertyType();
+ }
+ return pd.getPropertyType();
+ }
+
+ public static class BaseBean {
+ private Object value;
+
+ public Object getValue() {
+ return this.value;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ public Object getIndex(int index) {
+ return getValue();
+ }
+
+ public void setIndex(int index, Object value) {
+ setValue(value);
+ }
+ }
+
+ public static class MyBean extends BaseBean {
+ @Override
+ public String getValue() {
+ return (String) super.getValue();
+ }
+
+ public void setValue(String value) {
+ setValue((Object) value);
+ }
+
+ @Override
+ public String getIndex(int index) {
+ return getValue();
+ }
+
+ public void setIndex(int index, String value) {
+ setValue(value);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/Test8027905.java Fri Nov 08 14:09:18 2013 +0400
@@ -0,0 +1,71 @@
+/*
+ * 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 8027905
+ * @summary Tests that GC does not affect a property type
+ * @author Sergey Malenkov
+ */
+
+public class Test8027905 {
+ public static void main(String[] args) {
+ PropertyDescriptor pd = BeanUtils.getPropertyDescriptor(Sub.class, "foo");
+ Class<?> type = pd.getPropertyType();
+
+ int[] array = new int[10];
+ while (array != null) {
+ try {
+ array = new int[array.length + array.length];
+ }
+ catch (OutOfMemoryError error) {
+ array = null;
+ }
+ }
+ if (type != pd.getPropertyType()) {
+ throw new Error("property type is changed");
+ }
+ }
+
+ public static class Super<T> {
+ public T getFoo() {
+ return null;
+ }
+
+ public void setFoo(T t) {
+ }
+ }
+
+ public static class Sub extends Super<String> {
+ @Override
+ public String getFoo() {
+ return null;
+ }
+
+ @Override
+ public void setFoo(String t) {
+ }
+ }
+}