commit 2691e69e8851067f8f5bd1681e2375b7dfd5e036
author David Bainbridge <dbainbri@ciena.com> Fri Sep 22 07:48:29 2017 -0700
committer Gerrit Code Review <gerrit@opencord.org> Fri Sep 22 07:48:29 2017 -0700
tree 00a69f059df24f515f5a99a14edda16a12af5526
parent 77a6ac78fe15e8339eb10e125a6d63421fdc3c6f
parent 8c2895f596ffadf7218a058feb8c1f85cfb1c389

Merge "VOL-436:When starting ONOS, DHCPL2Relay complains SADIS not activated"

src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java

diff --git a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
index 06a7f4f..ec4a726 100755
--- a/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
+++ b/src/main/java/org/opencord/dhcpl2relay/DhcpL2Relay.java
@@ -188,7 +188,8 @@
         cancelDhcpPackets();
 
         componentConfigService.unregisterProperties(getClass(), false);
-
+        deviceService.removeListener(deviceListener);
+        mastershipService.removeListener(changeListener);
         log.info("DHCP-L2-RELAY Stopped");
     }