1 files changed, 5 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
index 3a96ced7c8..39dd71048b 100644
--- a/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/sca-client-rmi/src/main/java/org/apache/tuscany/sca/client/rmi/SCAClientFactoryImpl.java
@@ -45,6 +45,11 @@ public class SCAClientFactoryImpl extends SCAClientFactory {
     public SCAClientFactoryImpl(URI domainURI) {
         super(domainURI);
         NodeImpl node = (NodeImpl)NodeFactory.newInstance().createNode(domainURI);
+        if (node.getExtensionPoints() == null) {
+            // No local nodes have been started (for this domain?)
+            // ideally we'll use the Hazelcast client but for now just start a node
+            node.start();            
+        }
         this.extensionsRegistry = node.getExtensionPoints();
         UtilityExtensionPoint utilities = extensionsRegistry.getExtensionPoint(UtilityExtensionPoint.class);
         DomainRegistryFactory domainRegistryFactory = utilities.getUtility(DomainRegistryFactory.class);