commit 3ffbb2718947edcd42ab4ff8fa4c76f87e5435e7
author Madan Jampani <madan@onlab.us> Mon Oct 13 11:19:37 2014 -0700
committer Madan Jampani <madan@onlab.us> Mon Oct 13 11:19:37 2014 -0700
tree 62e8e979be302de78b5b2ab61e4617a3b182d28f
parent 1f601248d5d316b55da7339ac75090b612ee9fb1

Shutting down AE executor on GossipLinkStore deactivate

core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java
index 4cb936e..210bc96 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java
@@ -152,6 +152,16 @@
 
     @Deactivate
     public void deactivate() {
+
+        executor.shutdownNow();
+        try {
+            if (!executor.awaitTermination(5, TimeUnit.SECONDS)) {
+                log.error("Timeout during executor shutdown");
+            }
+        } catch (InterruptedException e) {
+            log.error("Error during executor shutdown", e);
+        }
+
         linkDescs.clear();
         links.clear();
         srcLinks.clear();