commit 2e71ef36713582eb86c8b3ea02535cf7dcf8e0b8
author Charles Chan <rascov@gmail.com> Thu Feb 23 15:44:08 2017 -0800
committer Charles Chan <rascov@gmail.com> Thu Feb 23 15:44:08 2017 -0800
tree 68be930d32f14bdc137cb2315b169434c9035fef
parent f933219171dac52656af3731784fda3d5929f8ef

Unregister neighbor handler when deactivating segment routing

Change-Id: Ibcc1d8ccbcb5b64fbb77e2e857885df7d3cf6500

src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java

diff --git a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index d7896a1..8cd657b 100644
--- a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -442,6 +442,8 @@
         cordConfigService.removeListener(cordConfigListener);
         routeService.removeListener(routeListener);
 
+        neighbourResolutionService.unregisterNeighbourHandlers(appId);
+
         processor = null;
         linkListener = null;
         deviceListener = null;
@@ -1063,7 +1065,7 @@
      * @param portToRegister connect point to register
      */
     public void registerConnectPoint(ConnectPoint portToRegister) {
-        this.neighbourResolutionService.registerNeighbourHandler(
+        neighbourResolutionService.registerNeighbourHandler(
                 portToRegister,
                 neighbourHandler,
                 appId