Fix Hazelcast client to correckt initilize Hazelcast registry endpointOwners and getHazelcastInstance

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

2 files changed, 10 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
index 4f43dfde6e..5bd06e66b8 100644
--- a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
@@ -25,6 +25,7 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 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 HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
         }

         initHazelcastClientInstance();

         endpointMap = hazelcastClient.getMap(configURI.getDomainName() + "/Endpoints");

+        endpointOwners = hazelcastClient.getMultiMap(configURI.getDomainName() + "/EndpointOwners");

     }

 

     @Override

@@ -64,4 +66,10 @@ public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
         }

         this.hazelcastClient = HazelcastClient.newHazelcastClient(configURI.getDomainName(), configURI.getPassword(), configURI.getRemotes().toArray(new String[0]));

     }

+

+    @Override

+    public HazelcastInstance getHazelcastInstance() {

+        return hazelcastClient;

+    }

+

 }

diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
index 35cab29479..a170376e07 100644
--- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
+++ b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
@@ -66,7 +66,7 @@ public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements 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 extends BaseEndpointRegistry implements 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;

                         }