diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 20:28:30 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 20:28:30 +0000 |
commit | 9b624f74edcead48b13634323224e2d972f7e6ce (patch) | |
tree | 9fc1a0f9cf0d49a0ca568d7e83dbe35ce9c7ec50 /sca-java-2.x/trunk/modules/node-api/src/main | |
parent | b8a63636ff2dbea555f14b42c5a49e1555e68f85 (diff) |
Bring up the servlet-scoped node start/stop with Spring MVC
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1083940 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java index f3853fc4bf..97fbb5b950 100644 --- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java +++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java @@ -117,11 +117,19 @@ public class NodeConfigurationImpl implements NodeConfiguration { } public NodeConfiguration addContribution(String contributionURI, URL location) { - return addContribution(contributionURI, location.toString()); + String url = null; + if (location != null) { + url = location.toString(); + } + return addContribution(contributionURI, url); } public NodeConfiguration addContribution(URI contributionURI, URL location) { - return addContribution(contributionURI.toString(), location.toString()); + String url = null; + if (location != null) { + url = location.toString(); + } + return addContribution(contributionURI.toString(), url); } public NodeConfiguration addContribution(URL... locations) { |