From 30cb91fdea8f91d8e363c409250f7f92b6e7929c Mon Sep 17 00:00:00 2001
From: Kanzhe Jiang <kanzhe.jiang@bigswitch.com>
Date: Wed, 11 Apr 2012 14:40:55 -0700
Subject: [PATCH] revert back to only reset AP's blocking state
---
.../devicemanager/internal/DeviceManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 7bc23bd23..459f77c94 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -1670,11 +1670,11 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
* Also make sure the attachmentPoints are in non-blocked state
*/
for (DeviceAttachmentPoint dap: tempAPMap.values()) {
- dap.resetConflictState();
+ dap.setBlocked(false);
}
d.setAttachmentPoints(tempAPMap.values());
for (DeviceAttachmentPoint dap : tempOldAPMap.values()) {
- dap.resetConflictState();
+ dap.setBlocked(false);
d.addOldAttachmentPoint(dap);
}
--
GitLab