From 979addb47b6383ff9de6f5bd3d388b4bc48d22a5 Mon Sep 17 00:00:00 2001
From: Kanzhe Jiang <kanzhe.jiang@bigswitch.com>
Date: Wed, 28 Mar 2012 14:52:51 -0700
Subject: [PATCH] fix a mistake in merge

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

diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index ba7a2241b..d2099fe59 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -980,7 +980,7 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
                             newAttachmentPoint = false;
                         } else {
                             nd.addAttachmentPoint(attachmentPoint);
-                            evHistAttachmtPt(nd, 
+                            evHistAttachmtPt(nd.getDataLayerAddressAsLong(), 
                                              attachmentPoint.getSwitchPort(),
                                              EvAction.ADDED, 
                                              "New AP from pkt-in");
-- 
GitLab