svn commit: r1086903 - /tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java

[antelder]

Author: antelder
Date: Wed Mar 30 10:50:23 2011
New Revision: 1086903

URL: http://svn.apache.org/viewvc?rev=1086903&view=rev
Log:
Update to use the correct domain name when the domain URI is not defaulting to 
the default name of 'default'

Modified:
    
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java?rev=1086903&r1=1086902&r2=1086903&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
 Wed Mar 30 10:50:23 2011
@@ -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.HazelcastInsta
  */
 public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry 
{
 
+    RegistryConfig rc;
     HazelcastClient hazelcastClient;
 
     public HazelcastClientEndpointRegistry(ExtensionPointRegistry registry,
@@ -55,8 +57,8 @@ public class HazelcastClientEndpointRegi
             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 HazelcastClientEndpointRegi
     }
 
     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 HazelcastClientEndpointRegi
         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]));
     }