1 files changed, 3 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
index d30797dc31..9ae4e302a9 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
@@ -674,10 +674,9 @@ public class HazelcastDomainRegistry extends BaseDomainRegistry implements Domai
         for (String m : runningCompositeOwners.keySet()) {
             Map<String, List<String>> rcs = runningCompositeOwners.get(m);
             if (rcs != null) {
-                for (String curi : rcs.keySet()) {
-                    if (rcs.get(curi).contains(compositeURI)) {
-                        return m;
-                    }
+                List<String> cs = rcs.get(contributionURI);
+                if (cs != null && cs.contains(compositeURI)) {
+                    return m;
                 }
             }
         }