From 9b624f74edcead48b13634323224e2d972f7e6ce Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 21 Mar 2011 20:28:30 +0000 Subject: 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 --- .../java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/node-impl/src') diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java index 0ff1a87fe9..2d46a8659b 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java @@ -336,10 +336,13 @@ public class NodeFactoryImpl extends NodeFactory { URI contributionURI = createURI(contrib.getURI()); URI uri = createURI(contrib.getLocation()); - if (uri.getScheme() == null) { + if (uri != null && uri.getScheme() == null) { uri = new File(contrib.getLocation()).toURI(); } - URL contributionURL = uri.toURL(); + URL contributionURL = null; + if (uri != null) { + contributionURL = uri.toURL(); + } // Load the contribution logger.log(quietLogging? Level.FINE : Level.INFO, "Loading contribution: " + contributionURL); -- cgit v1.2.3