Bug 380457 - Hotspot in MetaDataEnabledFeatureRegistryR3_4_0

1 files changed, 2 insertions, 10 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java
index d67b5375b..2f342239b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureRegistry.java
@@ -158,17 +158,9 @@ public class MetaDataEnabledFeatureRegistry{
 		for (Iterator it=typeCacheMap.keySet().iterator();it.hasNext();){
 			String featureTypeId = (String)it.next();
 			Class featureTypeClass = typeCacheMap.get(featureTypeId);
-			try {
-//				if (featureTypeClass.equals(typeClass)){
-//					ret.add(featureTypeClass);
-//				}
-//				else 
-					if (typeClass.asSubclass(featureTypeClass) != null)	{	
-					ret.addAll(featuresMap.get(featureTypeId));
-				}						
-			} catch (ClassCastException e) {//
+			if (featureTypeClass.isAssignableFrom(typeClass))	{	
+				ret.addAll(featuresMap.get(featureTypeId));
 			}
-			
 		}
 		return ret;
 	}