[jbosstools-commits] JBoss Tools SVN: r31114 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2011-05-05 16:22:54 -0400 (Thu, 05 May 2011)
New Revision: 31114

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
Log:
https://issues.jboss.org/browse/JBIDE-8865

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java	2011-05-05 20:02:31 UTC (rev 31113)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java	2011-05-05 20:22:54 UTC (rev 31114)
@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -95,12 +96,12 @@
 		ELContext context = PageContextFactory.createPageContext(file);
 
 		if (!(context instanceof XmlContextImpl)) {
-			return null;
+			return Collections.emptyList();
 		}
 			
 		ITagLibrary[] libraries = TagLibraryManager.getLibraries(file.getProject());
 		if (libraries == null)
-			return null;
+			return Collections.emptyList();;
 
 		List<IJSFVariable> result = new ArrayList<IJSFVariable>();