Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixing a minor bug in Cache replace code in Connection Manager.
[controller.git]
/
opendaylight
/
connectionmanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
connectionmanager
/
scheme
/
AbstractScheme.java
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 d93f74b4fe3a434cca4f6adc7f93ab52a56e748c..d7c4e5f933bdba54e0a0cd5411627546c0133b72 100644
(file)
--- 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)) {
* 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) {}
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(),
return putNodeToController(node, controller);
} else {
log.debug("Replace successful old={} with new={} for {} to {}", oldControllers.toString(), newControllers.toString(),