Unregister host listener when deactivating mobility app

Change-Id: I7f81dffb3e35da9e56893085a9e1e2d793036e85

@@ -68,12 +68,13 @@ public class HostMobility {
 
 
     private ApplicationId appId;
     private ApplicationId appId;
     private ExecutorService eventHandler;
     private ExecutorService eventHandler;
+    private final HostListener hostListener = new InternalHostListener();
 
 
     @Activate
     @Activate
     public void activate() {
     public void activate() {
         appId = coreService.registerApplication("org.onosproject.mobility");
         appId = coreService.registerApplication("org.onosproject.mobility");
         eventHandler = newSingleThreadScheduledExecutor(groupedThreads("onos/app-mobility", "event-handler", log));
         eventHandler = newSingleThreadScheduledExecutor(groupedThreads("onos/app-mobility", "event-handler", log));
-        hostService.addListener(new InternalHostListener());
+        hostService.addListener(hostListener);
         log.info("Started with Application ID {}", appId.id());
         log.info("Started with Application ID {}", appId.id());
     }
     }
 
 
@@ -81,6 +82,7 @@ public class HostMobility {
     public void deactivate() {
     public void deactivate() {
         // TODO we never actually add any flow rules
         // TODO we never actually add any flow rules
         flowRuleService.removeFlowRulesById(appId);
         flowRuleService.removeFlowRulesById(appId);
+        hostService.removeListener(hostListener);
         eventHandler.shutdown();
         eventHandler.shutdown();
         log.info("Stopped");
         log.info("Stopped");
     }
     }