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

[antelder]

Author: antelder
Date: Sat Mar 20 12:30:23 2010
New Revision: 925589

URL: http://svn.apache.org/viewvc?rev=925589&view=rev
Log:
Fix Hazelcast client to correckt initilize Hazelcast registry endpointOwners 
and getHazelcastInstance

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

Modified: 
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/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/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java?rev=925589&r1=925588&r2=925589&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
 Sat Mar 20 12:30:23 2010
@@ -25,6 +25,7 @@ import org.apache.tuscany.sca.core.Exten
 import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry;
 
 import com.hazelcast.client.HazelcastClient;
+import com.hazelcast.core.HazelcastInstance;
 
 /**
  * An EndpointRegistry using a Hazelcast Native Client
@@ -47,6 +48,7 @@ public class HazelcastClientEndpointRegi
         }
         initHazelcastClientInstance();
         endpointMap = hazelcastClient.getMap(configURI.getDomainName() + 
"/Endpoints");
+        endpointOwners = hazelcastClient.getMultiMap(configURI.getDomainName() 
+ "/EndpointOwners");
     }
 
     @Override
@@ -64,4 +66,10 @@ public class HazelcastClientEndpointRegi
         }
         this.hazelcastClient = 
HazelcastClient.newHazelcastClient(configURI.getDomainName(), 
configURI.getPassword(), configURI.getRemotes().toArray(new String[0]));
     }
+
+    @Override
+    public HazelcastInstance getHazelcastInstance() {
+        return hazelcastClient;
+    }
+
 }

Modified: 
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java?rev=925589&r1=925588&r2=925589&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
 Sat Mar 20 12:30:23 2010
@@ -66,7 +66,7 @@ public class HazelcastEndpointRegistry e
     private HazelcastInstance hazelcastInstance;
     protected Map<Object, Object> endpointMap;
     private Map<String, Endpoint> localEndpoints = new HashMap<String, 
Endpoint>();
-    private MultiMap<String, String> endpointOwners;
+    protected MultiMap<String, String> endpointOwners;
     private AssemblyFactory assemblyFactory;
 
     public HazelcastEndpointRegistry(ExtensionPointRegistry registry,
@@ -303,7 +303,7 @@ public class HazelcastEndpointRegistry e
                 Endpoint ep = assemblyFactory.createEndpoint();
                 ep.setURI(service);
                 if (ep.matches(serviceURI)) {
-                    for (Member m : 
hazelcastInstance.getCluster().getMembers()) {
+                    for (Member m : 
getHazelcastInstance().getCluster().getMembers()) {
                         if 
(memberAddr.equals(m.getInetSocketAddress().toString())) {
                             return m;
                         }