From ac0e8b990a0dbe22a9d9370eb053236cb08f4888 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 19 May 2011 08:50:39 +0000
Subject: Guard against NPE

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1124611 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java')

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 bd979aa4a3..c0687cd13f 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
@@ -669,9 +669,11 @@ public class HazelcastDomainRegistry extends BaseDomainRegistry implements Domai
     public String getRunningMember(String contributionURI, String compositeURI) {
         for (String m : runningCompositeOwners.keySet()) {
             Map<String, List<String>> rcs = runningCompositeOwners.get(m);
-            for (String curi : rcs.keySet()) {
-                if (rcs.get(curi).contains(compositeURI)) {
-                    return m;
+            if (rcs != null) {
+                for (String curi : rcs.keySet()) {
+                    if (rcs.get(curi).contains(compositeURI)) {
+                        return m;
+                    }
                 }
             }
         }
-- 
cgit v1.2.3