From d4ac8fd386e44a94c799d7df620e342968b3840b Mon Sep 17 00:00:00 2001
From: Kanzhe Jiang <kanzhe.jiang@bigswitch.com>
Date: Mon, 13 Feb 2012 16:13:03 -0800
Subject: [PATCH] update storage when device network address or ap is aged out

---
 .../devicemanager/internal/DeviceManagerImpl.java             | 4 +++-
 1 file changed, 3 insertions(+), 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 bd1c60b83..610b7f4da 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -1781,7 +1781,8 @@ public class DeviceManagerImpl implements IDeviceManager, IOFMessageListener,
 
             if (address.getLastSeen().before(agedBoundary)) {
                 devMgrMaps.delNwAddrByDataLayerAddr(device.getDataLayerAddressAsLong(), 
-                        address.getNetworkAddress().intValue());
+                    address.getNetworkAddress().intValue());
+                removeNetworkAddressFromStorage(device, address);
             }
         }
     }
@@ -1800,6 +1801,7 @@ public class DeviceManagerImpl implements IDeviceManager, IOFMessageListener,
                 devMgrMaps.delDevAttachmentPoint(device, ap.getSwitchPort());
                 evHistAttachmtPt(device, ap.getSwitchPort(), EvAction.REMOVED,
                         "Aged");
+                removeAttachmentPointFromStorage(device, ap);
             }
         }
     }
-- 
GitLab