| commit | 632f16bfd8016f82c077555573762306d0577bd7 | [log] [tgz] |
|---|---|---|
| author | Madan Jampani <madan@onlab.us> | Tue Aug 11 12:42:59 2015 -0700 |
| committer | Brian O'Connor <bocon@onlab.us> | Tue Aug 11 23:33:47 2015 +0000 |
| tree | 16977e50213deba4e09a284aadebb816da26a5eb | |
| parent | 25be4915846cc5b0cde3c454487a38dbff9447e6 [diff] |
Destroy ECMap instances on deactivate Change-Id: I2437582b8d878bbf57d8447cb7d93636c9fc0246 (cherry picked from commit 0fa172fd1bf39495b1f763bbfead6257e815027a)
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java index 842274a..3d106c9 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -252,7 +252,7 @@ @Deactivate public void deactivate() { - + devicePortStats.destroy(); executor.shutdownNow(); backgroundExecutor.shutdownNow();
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java index 2925830..78c6468 100644 --- a/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java +++ b/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
@@ -137,6 +137,7 @@ @Deactivate public void deactivate() { + orderRelationship.destroy(); tunnelIdAsKeyStore.destroy(); srcAndDstKeyStore.destroy(); typeKeyStore.destroy();