Author: scabanovich Date: 2009-07-24 11:39:52 -0400 (Fri, 24 Jul 2009) New Revision: 16780 Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java Log: JBIDE-1826 Dependency on old kb plugin removed. Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-07-24 15:38:19 UTC (rev 16779) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-07-24 15:39:52 UTC (rev 16780) @@ -217,7 +217,10 @@ processors.addAll(fProcessorsMap.get(contentType).get(fPartitionType)); } if (fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB) != null) { - processors.addAll(fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB).get(fPartitionType)); + List<IContentAssistProcessor> list = fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB).get(fPartitionType); + if(list != null) { + processors.addAll(list); + } } if(processors.size() == 0) { return new ICompletionProposal[0];