commit 21f5ae8632afd7f4390090133f2b4bca7367d00c
author Deepa Vaddireddy <dvaddire@partner.ciena.com> Wed May 10 18:27:30 2017 +0530
committer Ray Milkey <ray@onlab.us> Thu May 11 20:37:21 2017 +0000
tree c84398d3a22d662fb737505ce7bb8b0a252f4b0c
parent 73a6f5d72aa17ff67330c149bec66dd493d9fc4a

Fix for ONOS-6433:NPE when deactivating org.onosproject.netcfglinksprovider

Change-Id: I876483f5d05679f9f3485ba0c40e29f062e39568

providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java

diff --git a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
index 0d1d9a8..a6f4d4e 100644
--- a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
+++ b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
@@ -162,6 +162,9 @@
     protected void deactivate() {
         withdrawIntercepts();
         providerRegistry.unregister(this);
+        deviceService.removeListener(deviceListener);
+        netCfgService.removeListener(cfgListener);
+        packetService.removeProcessor(packetProcessor);
         disable();
         log.info("Deactivated");
     }