From d7206c0c4f8288f990efd279b4ad59bc6d5825ee Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Sun, 25 Aug 2013 17:34:05 -0700 Subject: [PATCH] Fixing a minor bug in Cache replace code in Connection Manager. Change-Id: Ic885dc0890860abb23b067458353ba16d21b275b Signed-off-by: Madhu Venugopal --- .../controller/connectionmanager/scheme/AbstractScheme.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 d93f74b4fe..d7c4e5f933 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 @@ -237,13 +237,12 @@ public abstract class AbstractScheme { * with this controller to take hold of a Node. */ if (isConnectionAllowed(node)) { - if (!nodeConnections.replace(node, oldControllers, newControllers)) { + if (oldControllers == null || !nodeConnections.replace(node, oldControllers, newControllers)) { clusterServices.trollback(); try { Thread.sleep(100); } catch ( InterruptedException e) {} - log.debug("Replace failed... old={} with new={} for {} to {}", oldControllers.toString(), newControllers.toString(), - controller.getHostAddress(), node.toString()); + log.debug("Retrying ... {} with {}", controller.getHostAddress(), node.toString()); return putNodeToController(node, controller); } else { log.debug("Replace successful old={} with new={} for {} to {}", oldControllers.toString(), newControllers.toString(), -- 2.36.6