commit | 81728d552fd7d8b4cd9dfb143fbc515feddd29c4 | [log] [tgz] |
---|---|---|
author | Deepa Vaddireddy <dvaddire@partner.ciena.com> | Wed Sep 20 20:36:52 2017 +0530 |
committer | David Bainbridge <dbainbri@ciena.com> | Thu Sep 21 07:41:39 2017 -0700 |
tree | 7282432146b3c43bd9280cfe9a68b925c767d6c5 | |
parent | 75bf02d62fb726a1d24501c29418d7b4222c71cd [diff] |
NPE in dhcpl2rrealy when device mastership/availability changes. Change-Id: Ibd933237cc264aca0a862c2620f8ac743a809e9c (cherry picked from commit 77a6ac78fe15e8339eb10e125a6d63421fdc3c6f)
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"); }