Author: rob.stryker(a)jboss.com Date: 2008-08-22 16:46:59 -0400 (Fri, 22 Aug 2008) New Revision: 9875 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java Log: JBIDE-2646 - null checks added Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-08-22 20:37:34 UTC (rev 9874) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-08-22 20:46:59 UTC (rev 9875) @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; +import org.dom4j.Document; import org.dom4j.Node; import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode; @@ -103,11 +104,13 @@ String[] files = getFilter().getIncludedFiles(); String fileLoc; ArrayList<XPathFileResult> resultList = new ArrayList<XPathFileResult>(); - List<Node> nodeList; + List<Node> nodeList = null; for( int i = 0; i < files.length; i++ ) { fileLoc = new Path(baseDir).append(files[i]).toOSString(); - nodeList = getRepository().getDocument(fileLoc).selectNodes(xpathPattern); - if( nodeList.size() > 0 ) + Document d = getRepository().getDocument(fileLoc); + if( d != null ) + nodeList = d.selectNodes(xpathPattern); + if( nodeList != null && nodeList.size() > 0 ) resultList.add(new XPathFileResult(this, fileLoc, nodeList)); } results = resultList.toArray(new XPathFileResult[resultList.size()]);