commit c7a8a681ccc24b224be09a68c7f073cc0dc553d4
author Charles Chan <rascov@gmail.com> Mon Jun 19 00:43:31 2017 -0700
committer Charles Chan <rascov@gmail.com> Mon Jun 19 00:45:41 2017 -0700
tree a4e7539b01db2b1dead907a2629e70e2e469a523
parent 7c6d51c82f7be5e423359a1a4c9662e9b0220c80

ONOS-6658 Remove host listener when deactivating SR

Change-Id: Ie65650b61873e2539ba77d55ff7daeb0a559b5b9

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

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 6bacfce..c61d5c9 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -386,11 +386,10 @@
         linkService.addListener(linkListener);
         deviceService.addListener(deviceListener);
         multicastRouteService.addListener(mcastListener);
+        routeService.addListener(routeListener);
 
         cfgListener.configureNetwork();
 
-        routeService.addListener(routeListener);
-
         log.info("Started");
     }
 
@@ -420,6 +419,7 @@
         cfgService.unregisterConfigFactory(mcastConfigFactory);
         cfgService.unregisterConfigFactory(pwaasConfigFactory);
 
+        hostService.removeListener(hostListener);
         packetService.removeProcessor(processor);
         linkService.removeListener(linkListener);
         deviceService.removeListener(deviceListener);