Author: antelder
Date: Wed May 6 10:42:56 2009
New Revision: 772141
URL: http://svn.apache.org/viewvc?rev=772141&view=rev
Log:
Fix for when domain name is null
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=772141&r1=772140&r2=772141&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
Wed May 6 10:42:56 2009
@@ -679,7 +679,7 @@
// Start the composite
compositeActivator.start(composite);
- SCAClientImpl.addDomain(URI.create(configurationName), this);
+ SCAClientImpl.addDomain(getDomainName(), this);
} catch (ActivationException e) {
throw new IllegalStateException(e);
@@ -692,7 +692,7 @@
try {
- SCAClientImpl.removeDomain(URI.create(configurationName));
+ SCAClientImpl.removeDomain(getDomainName());
// Stop the composite
compositeActivator.stop(composite);
@@ -705,6 +705,16 @@
}
}
+
+ private URI getDomainName() {
+ URI domainName;
+ if (configurationName != null) {
+ domainName = URI.create(configurationName);
+ } else {
+ domainName = URI.create("default");
+ }
+ return domainName;
+ }
public void destroy() {
// Stop the runtime modules
