From 38b85968795525888fe4b2d2036967cda406fa36 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Wed, 12 Jun 2013 18:36:07 -0700
Subject: [PATCH] The previous fix is not correct. The fix generates a device
moved event when the attachment points are not even updated.
Revert "Device moved notification has to be generated when the new attachment point was already in the oldAP list."
This reverts commit 2d6a75c4116790db7d1ddaa53e0d6d873d035815.
---
.../devicemanager/internal/Device.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
index 457bb5644..ef0ba3468 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
@@ -464,14 +464,11 @@ public class Device implements IDevice {
} else if (oldAPFlag) {
// retain oldAP as is. Put the newAP in oldAPs for flagging
// possible duplicates.
- oldAPList = new ArrayList<AttachmentPoint>();
- if (oldAPs != null) oldAPList.addAll(oldAPs);
- // Add to oldAPList only if it was picked up from the oldAPList
- oldAPList.add(newAP);
- this.oldAPs = oldAPList;
- if (!topology.isInSameBroadcastDomain(oldAP.getSw(), oldAP.getPort(),
- newAP.getSw(), newAP.getPort()))
- return true; // attachment point changed.
+ oldAPList = new ArrayList<AttachmentPoint>();
+ if (oldAPs != null) oldAPList.addAll(oldAPs);
+ // Add ot oldAPList only if it was picked up from the oldAPList
+ oldAPList.add(newAP);
+ this.oldAPs = oldAPList;
}
return false;
}
--
GitLab