[200932] JSF Content assist throws NPE for action attribute if project doesn't have JSF facet

1 files changed, 6 insertions, 5 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ActionType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ActionType.java
index a23626e30..7723b6d93 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ActionType.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ActionType.java
@@ -63,8 +63,12 @@ public class ActionType extends MethodBindingType implements IPossibleValues{
 		//optimize
 		IWorkspaceContextResolver wr = IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(getStructuredDocumentContext());
 		if (wr == null)
-			return false;//shouldn't get here
+			return true;//shouldn't get here
 		
+		//in case that this is not JSF faceted or missing configs, need to pass
+		if (JSFAppConfigManager.getInstance(wr.getProject()) == null) 
+			return true;
+			
 		IFile jsp = (IFile)wr.getResource();
 		List rules = JSFAppConfigManager.getInstance(wr.getProject()).getNavigationRulesForPage(jsp);
 		for(Iterator it=rules.iterator();it.hasNext();){
@@ -79,18 +83,15 @@ public class ActionType extends MethodBindingType implements IPossibleValues{
 		getValidationMessages().add(msg);
 		return false;
 		
-		
-
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues#getPossibleValues()
 	 */
 	public List getPossibleValues() {
-		// TODO getNavigationRules for this page from JSFAppMgr
 		List ret = new ArrayList();
 		IWorkspaceContextResolver wr = IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(getStructuredDocumentContext());
-		if (wr != null){
+		if (wr != null && JSFAppConfigManager.getInstance(wr.getProject()) != null) {//may not be JSF faceted project or know faces-config){			
 			IFile jsp = (IFile)wr.getResource();
 			List rules = JSFAppConfigManager.getInstance(wr.getProject()).getNavigationRulesForPage(jsp);
 			for(Iterator it=rules.iterator();it.hasNext();){