Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 1705:d73a741a7ea1
6868185: 2 JCK api/java_beans/Introspector/ tests fails starting from jdk7 b66
Reviewed-by: peterz
author | malenkov |
---|---|
date | Tue, 08 Sep 2009 14:08:59 +0400 |
parents | 01c46cb72eb7 |
children | e289c06b6d36 6216604c05e2 |
files | src/share/classes/com/sun/beans/finder/BeanInfoFinder.java |
diffstat | 1 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java Mon Sep 07 15:09:40 2009 +0400 +++ b/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java Tue Sep 08 14:08:59 2009 +0400 @@ -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; - } }