6868185: 2 JCK api/java_beans/Introspector/ tests fails starting from jdk7 b66
Reviewed-by: peterz
diff --git a/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java b/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
index faab85c..5dda4df 100644
--- a/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
+++ b/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
@@ -52,8 +52,14 @@
}
@Override
- protected BeanInfo instantiate(Class<?> type, String name) {
- BeanInfo info = super.instantiate(type, name);
+ protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
+ // this optimization will only use the BeanInfo search path
+ // if is has changed from the original
+ // or trying to get the ComponentBeanInfo
+ BeanInfo info = !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name)
+ ? super.instantiate(type, prefix, name)
+ : null;
+
if (info != null) {
// make sure that the returned BeanInfo matches the class
BeanDescriptor bd = info.getBeanDescriptor();
@@ -89,14 +95,4 @@
}
return null;
}
-
- @Override
- protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
- // this optimization will only use the BeanInfo search path
- // if is has changed from the original
- // or trying to get the ComponentBeanInfo
- return !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name)
- ? super.instantiate(type, prefix, name)
- : null;
- }
}
