commit 62f15331a681af67808157f421aa82123a20d5f6
author Madan Jampani <madan.jampani@gmail.com> Mon Feb 01 13:18:39 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Feb 01 22:58:08 2016 +0000
tree 5e84fc3185bb06ae3ad38102fcfc477dd007edb6
parent 551d0d269e5b8cd7d6e5428df53ae7a81728e51f

Remove map listener when caching async consistent map is destroyed

Change-Id: I924609fa484d469c6ea290e9c8879d1ab49cf9fa

core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CachingAsyncConsistentMap.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CachingAsyncConsistentMap.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CachingAsyncConsistentMap.java
index aaa01e4..5054a0d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CachingAsyncConsistentMap.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CachingAsyncConsistentMap.java
@@ -21,6 +21,7 @@
 import java.util.function.Predicate;
 
 import org.onosproject.store.service.AsyncConsistentMap;
+import org.onosproject.store.service.MapEventListener;
 import org.onosproject.store.service.Versioned;
 
 import com.google.common.cache.CacheBuilder;
@@ -51,9 +52,16 @@
                             }
                         });
 
+    private final MapEventListener<K, V> cacheInvalidator = event -> cache.invalidate(event.key());
+
     public CachingAsyncConsistentMap(AsyncConsistentMap<K, V> backingMap) {
         super(backingMap);
-        super.addListener(event -> cache.invalidate(event.key()));
+        super.addListener(cacheInvalidator);
+    }
+
+    @Override
+    public CompletableFuture<Void> destroy() {
+        return super.destroy().thenCompose(v -> removeListener(cacheInvalidator));
     }
 
     @Override