commit | a134ee39a9cf0fe34c83926f12f51289dd24e856 | [log] [tgz] |
---|---|---|
author | Charles Chan <rascov@gmail.com> | Thu Jul 19 09:52:01 2018 -0700 |
committer | Thomas Vachuska <tom@opennetworking.org> | Tue Jul 24 21:11:46 2018 +0000 |
tree | 2881c5a4009042edfb162f453f5df99ded0f99f5 | |
parent | 8df698a52b98afa57c08f8d77e6a7d75cbb4bf36 [diff] [blame] |
Cancel DHCP packet request when DHCP relay app is being deactivated Change-Id: Ic1c10e63471460893865962541806c88fcfdf22d
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java index b47e1ed..b7fba34 100644 --- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java +++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -260,8 +260,10 @@ providerRegistry.unregister(this); hostService.removeListener(hostListener); defaultServerInfoList.forEach(this::stopMonitoringIps); + defaultServerInfoList.forEach(info -> info.getDhcpServerIp6().ifPresent(this::cancelDhcpPacket)); defaultServerInfoList.clear(); indirectServerInfoList.forEach(this::stopMonitoringIps); + indirectServerInfoList.forEach(info -> info.getDhcpServerIp6().ifPresent(this::cancelDhcpPacket)); indirectServerInfoList.clear(); }