From: Chi-Vien Ly <chivly@cisco.com>
Date: Tue, 24 Dec 2013 16:22:31 +0000 (+0000)
Subject: Merge "Add some log messages in case controller failed to add connected node."
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~150
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0c5fea94e6b10494863a9ed3603279919cb3ef1c;hp=9212fed678702583f4a555641208cf1c7b45b829

Merge "Add some log messages in case controller failed to add connected node."
---

diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java b/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java
index 5ba156ea7c..718a3ff166 100644
--- a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java
+++ b/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java
@@ -277,6 +277,11 @@ public abstract class AbstractScheme {
 
     public Status addNode (Node node, InetAddress controller) {
         if (node == null || controller == null) {
+            if (node == null) {
+                log.warn("addNode: node is null");
+            } else if (controller == null) {
+                log.error("Failed to add node {}. The controller address retrieved from clusterServices is null.", node);
+            }
             return new Status(StatusCode.BADREQUEST);
         }
         if (isLocal(node))  {