From f83c9ef65ba2f50db8993e0fdc69f5f88b0c84e4 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Sun, 22 Jul 2012 11:27:41 -0700
Subject: [PATCH] Bug fix: prevCluster assignment is changed to reflect the L2
 domain ID of the prev entity.  It was possible for cur and prev to be swapped
 when duplicate attachment points were detected, where the prevCluster could
 have the wrong assignment.

---
 .../net/floodlightcontroller/devicemanager/internal/Device.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
index 9795363ae..b975ddf7c 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
@@ -332,7 +332,7 @@ public class Device implements IDevice {
             }
             
             prev = clentities[clEntIndex] = cur;
-            prevCluster = curCluster;
+            prevCluster = topology.getL2DomainId(prev.getSwitchDPID());
 
             long prevLastSeen = 
                     deviceManager.apComparator.
-- 
GitLab