commit db9b20e03c83d94d0c07add7ebf81ec2625e7902
author Andrea Campanella <andrea@opennetworking.org> Thu Sep 14 07:44:16 2017 -0700
committer Gerrit Code Review <gerrit@opencord.org> Thu Sep 14 07:44:16 2017 -0700
tree 5605e7efa556fad32928f18675f888c6b1700194
parent f2a197e75349d4ae58f710688065cd153b48c845
parent d377fe664329a00ee69b41cf06df3f122206f2c6

Merge "Avoid NPexception on domainId mismatch"

global/http-channel/src/main/java/org/opencord/ce/global/channel/client/HttpClientInstance.java

diff --git a/global/http-channel/src/main/java/org/opencord/ce/global/channel/client/HttpClientInstance.java b/global/http-channel/src/main/java/org/opencord/ce/global/channel/client/HttpClientInstance.java
index eb820fb..5190363 100644
--- a/global/http-channel/src/main/java/org/opencord/ce/global/channel/client/HttpClientInstance.java
+++ b/global/http-channel/src/main/java/org/opencord/ce/global/channel/client/HttpClientInstance.java
@@ -112,7 +112,7 @@
     }
 
     private boolean isLeader(String topic) {
-        return leadershipService.getLeader(topic).id()
+        return topic != null && leadershipService.getLeader(topic).id()
                 .equals(clusterService.getLocalNode().id().id());
     }
 
@@ -135,7 +135,11 @@
     }
 
     private String getTopic(DomainId domainId) {
-        return domainsEndPointsMap.get(domainId).getRight().topic();
+        if (domainsEndPointsMap.get(domainId) != null) {
+            return domainsEndPointsMap.get(domainId).getRight().topic();
+        }
+        log.info("Domain ID {} not among configured domain IDs", domainId.id());
+        return null;
     }
 
     private Client createClient() {