| commit | 85525a80e6820c12658b488883839f4f5f36a6bf | [log] [tgz] |
|---|---|---|
| author | pier <pier@opennetworking.org> | Mon Apr 01 23:38:42 2019 -0700 |
| committer | Pier Luigi Ventre <pier@opennetworking.org> | Wed Apr 03 18:47:13 2019 +0000 |
| tree | 1fab96762766a55f424349fc7f9c88d7d3911fa9 | |
| parent | ed2ea35755df0581ae0345622a1c510e5ab06702 [diff] |
Remove listeners before shutting down the executors Change-Id: I1496ec06a839bb893e35a2e6d322d9eed33f45f2 (cherry picked from commit 024f44c902768868a136987b895b784f960a3e43)
diff --git a/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java b/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java index ed59699..b040147 100644 --- a/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java +++ b/apps/portloadbalancer/src/main/java/org/onosproject/portloadbalancer/app/PortLoadBalancerManager.java
@@ -171,6 +171,8 @@ portLoadBalancerStore.removeListener(portLoadBalancerStoreListener); portLoadBalancerNextStore.removeListener(portLoadBalancerNextStoreListener); + deviceService.removeListener(deviceListener); + portLoadBalancerEventExecutor.shutdown(); portLoadBalancerProvExecutor.shutdown(); deviceEventExecutor.shutdown();
diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java index 7a579b2..102d469 100644 --- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java +++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
@@ -250,6 +250,7 @@ xconnectStore.removeListener(xconnectListener); deviceService.removeListener(deviceListener); hostService.removeListener(hostListener); + portLoadBalancerService.removeListener(portLoadBalancerListener); codecService.unregisterCodec(XconnectDesc.class); deviceEventExecutor.shutdown();