stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6868185: 2 JCK api/java_beans/Introspector/ tests fails starting from jdk7 b66

Browse Source 
Reviewed-by: peterz
This commit is contained in:
Sergey Malenkov 2009-09-08 14:08:59 +04:00
parent b339e0eaac
commit e9e1f27be4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
View File

@ -52,8 +52,14 @@ public final class BeanInfoFinder
} }
@Override @Override
protected BeanInfo instantiate(Class<?> type, String name) { protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
BeanInfo info = super.instantiate(type, 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) { if (info != null) {
// make sure that the returned BeanInfo matches the class // make sure that the returned BeanInfo matches the class
BeanDescriptor bd = info.getBeanDescriptor(); BeanDescriptor bd = info.getBeanDescriptor();
@ -89,14 +95,4 @@ public final class BeanInfoFinder
} }
return null; 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;
}
} }