Madan Jampani
Committed by Brian O'Connor

Destroy ECMap instances on deactivate

Change-Id: I2437582b8d878bbf57d8447cb7d93636c9fc0246
(cherry picked from commit 0fa172fd)
...@@ -252,7 +252,7 @@ public class GossipDeviceStore ...@@ -252,7 +252,7 @@ public class GossipDeviceStore
252 252
253 @Deactivate 253 @Deactivate
254 public void deactivate() { 254 public void deactivate() {
255 - 255 + devicePortStats.destroy();
256 executor.shutdownNow(); 256 executor.shutdownNow();
257 257
258 backgroundExecutor.shutdownNow(); 258 backgroundExecutor.shutdownNow();
......
...@@ -137,6 +137,7 @@ public class DistributedTunnelStore ...@@ -137,6 +137,7 @@ public class DistributedTunnelStore
137 137
138 @Deactivate 138 @Deactivate
139 public void deactivate() { 139 public void deactivate() {
140 + orderRelationship.destroy();
140 tunnelIdAsKeyStore.destroy(); 141 tunnelIdAsKeyStore.destroy();
141 srcAndDstKeyStore.destroy(); 142 srcAndDstKeyStore.destroy();
142 typeKeyStore.destroy(); 143 typeKeyStore.destroy();
......