[204399] NPE in MetadataContextResolver.getPropertyValue(...)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java
index b623100..495589f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java
@@ -63,13 +63,10 @@
final ITaglibDomainMetaDataModelContext mdContext = TaglibDomainMetaDataQueryHelper.createMetaDataModelContext(project, uri);
Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(mdContext, element.getLocalName()+"/"+attribute.getLocalName(), key); //$NON-NLS-1$
- return TraitValueHelper.getValueAsListOfStrings(trait);
-// return
-// CMAnnotationHelper.
-// getCMAttributeProperties(uri,
-// element.getLocalName(),
-// attribute.getLocalName(),
-// key);
+ if( trait != null )
+ {
+ return TraitValueHelper.getValueAsListOfStrings(trait);
+ }
}
else if (curNode instanceof Element)
@@ -80,12 +77,10 @@
final ITaglibDomainMetaDataModelContext mdContext = TaglibDomainMetaDataQueryHelper.createMetaDataModelContext(project, uri);
Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(mdContext, element.getLocalName(), key);
- return TraitValueHelper.getValueAsListOfStrings(trait);
-// return
-// CMAnnotationHelper.
-// getCMElementProperties(uri,
-// element.getLocalName(),
-// key);
+ if( trait != null )
+ {
+ return TraitValueHelper.getValueAsListOfStrings(trait);
+ }
}
return Collections.EMPTY_LIST;