commit 59a6c0658b20c56c26496c3992639ef1c3dbff13
author Charles Chan <rascov@gmail.com> Mon Jun 19 00:43:31 2017 -0700
committer Charles Chan <rascov@gmail.com> Mon Jun 19 02:13:32 2017 -0700
tree ce48bcd15aaeb1a13407518ed427da14b50ce271
parent 6daae9428d71105886eb45249c4b5cdab9faf556

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 c783081..a10870c 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -374,11 +374,10 @@
         linkService.addListener(linkListener);
         deviceService.addListener(deviceListener);
         multicastRouteService.addListener(mcastListener);
+        routeService.addListener(routeListener);
 
         cfgListener.configureNetwork();
 
-        routeService.addListener(routeListener);
-
         log.info("Started");
     }
 
@@ -408,6 +407,7 @@
         cfgService.unregisterConfigFactory(mcastConfigFactory);
         cfgService.unregisterConfigFactory(pwaasConfigFactory);
 
+        hostService.removeListener(hostListener);
         packetService.removeProcessor(processor);
         linkService.removeListener(linkListener);
         deviceService.removeListener(deviceListener);