Author: rfeng
Date: Thu Mar 5 06:51:20 2009
New Revision: 750340
URL: http://svn.apache.org/viewvc?rev=750340&view=rev
Log:
Avoid the NPE
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=750340&r1=750339&r2=750340&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Thu Mar 5 06:51:20 2009
@@ -38,9 +38,6 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Component;
@@ -84,7 +81,6 @@
import org.apache.tuscany.sca.node.Client;
import org.apache.tuscany.sca.node.ContributionLocationHelper;
import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.provider.DefinitionsProvider;
import org.apache.tuscany.sca.provider.DefinitionsProviderException;
import org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint;
@@ -567,7 +563,10 @@
// available
compositeActivator.setDomainComposite(tempComposite);
+ /*
+ // The following line may return null, to be investigated
XPathFactory xPathFactory =
modelFactories.getFactory(XPathFactory.class);
+
for (PolicySet policySet : systemDefinitions.getPolicySets()) {
if (policySet.getAppliesTo() != null) {
XPath xpath = xPathFactory.newXPath();
@@ -578,6 +577,7 @@
// exp.evaluate(item, XPathConstants.BOOLEAN);
}
}
+ */
}
public void start() {
