commit 77a6ac78fe15e8339eb10e125a6d63421fdc3c6f
author Deepa Vaddireddy <dvaddire@partner.ciena.com> Wed Sep 20 20:36:52 2017 +0530
committer Deepa Vaddireddy <dvaddire@partner.ciena.com> Wed Sep 20 20:36:52 2017 +0530
tree a4b24ff06270baa9a397011fbfebb97014de8d00
parent 0b6396b4abb49a0ec520e5819b91ec55ae584304

NPE in dhcpl2rrealy when device mastership/availability changes.

Change-Id: Ibd933237cc264aca0a862c2620f8ac743a809e9c

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");
     }