summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-05-19 08:50:39 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-05-19 08:50:39 +0000
commitac0e8b990a0dbe22a9d9370eb053236cb08f4888 (patch)
treef30f2f154bd78e810818c0719d3a4cc61faf400c
parentce208dd59902981b9fac895a6596d0e08b065da6 (diff)
Guard against NPE
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1124611 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java8
1 files changed, 5 insertions, 3 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 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;
+ }
}
}
}