From 49c5c2093a5f0fc2561dc53074fd103b5ee3dafe Mon Sep 17 00:00:00 2001
From: Mandeep Dhami <mandeep.dhami@bigswitch.com>
Date: Wed, 1 Aug 2012 01:14:49 -0700
Subject: [PATCH] Fixed prev checkin (b5f2b1b)
---
.../net/floodlightcontroller/core/internal/Controller.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 3890de045..a29f16a4a 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -906,13 +906,13 @@ public class Controller implements IFloodlightProviderService,
// case and we don't want to log those spurious errors.
shouldLogError = !isBadVendorError;
if (isBadVendorError) {
- if (state.firstRoleReplyReceived) {
+ if (state.firstRoleReplyReceived && (role != null)) {
log.warn("Received ERROR from sw {} that "
+"indicates roles are not supported "
+"but we have received a valid "
+"role reply earlier", sw);
- state.firstRoleReplyReceived = false;
}
+ state.firstRoleReplyReceived = true;
sw.deliverRoleRequestNotSupported(error.getXid());
synchronized(roleChanger) {
if (sw.role == null && Controller.this.role==Role.SLAVE) {
--
GitLab