Update to use the correct domain name when the domain URI is not defaulting to the default name of 'default'

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1086903 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
index 8b9e49ecd3..1bc663fdfc 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
@@ -25,6 +25,7 @@ import java.net.NetworkInterface;
 import java.net.ServerSocket;
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
@@ -40,6 +41,7 @@ import com.hazelcast.core.HazelcastInstance;
  */
 public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
 
+    RegistryConfig rc;
     HazelcastClient hazelcastClient;
 
     public HazelcastClientEndpointRegistry(ExtensionPointRegistry registry,
@@ -55,8 +57,8 @@ public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
             throw new IllegalStateException("The registry has already been started");
         }
         initHazelcastClientInstance();
-        endpointMap = hazelcastClient.getMap(domainURI + "/Endpoints");
-        endpointOwners = hazelcastClient.getMultiMap(domainURI + "/EndpointOwners");
+        endpointMap = hazelcastClient.getMap(rc.getUserid() + "/Endpoints");
+        endpointOwners = hazelcastClient.getMultiMap(rc.getUserid() + "/EndpointOwners");
     }
 
     @Override
@@ -69,8 +71,11 @@ public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
     }
 
     private void initHazelcastClientInstance() {
-        this.properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
-        RegistryConfig rc = new RegistryConfig(properties);
+        if (this.domainURI == null) {
+            this.properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
+            this.domainURI = properties.getProperty("defaultDomainName", "default");
+        }
+        this.rc = RegistryConfig.parseConfigURI(domainURI);
         if (rc.getWKAs().size() < 1) {
             String ip = getDefaultWKA();
             if (ip != null) {
@@ -80,7 +85,6 @@ public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
         if (rc.getWKAs().size() < 1) {
             throw new IllegalArgumentException("Must specify remote IP address(es) for domain");
         }
-        this.domainURI = properties.getProperty("defaultDomainName", "default");
         this.hazelcastClient = HazelcastClient.newHazelcastClient(rc.getUserid(), rc.getPassword(), rc.getWKAs().toArray(new String[0]));
     }