commit 15687d120a413d15a024b1956a870cdac7484286
author Madan Jampani <madan@onlab.us> Tue Aug 11 07:19:35 2015 -0700
committer Madan Jampani <madan@onlab.us> Tue Aug 11 07:19:35 2015 -0700
tree 95c1f290042645ccd5125437a6e3662c4a8fe372
parent f44e42cf6391e72bb914a060b9555717634b189c

Use thread-safe multimaps

Change-Id: I4e2d1d39fff29caa90159673dd3bd7ff82682c3c

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
index 8cb587d..1bccf2e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;
 
@@ -125,8 +126,10 @@
     private ExecutorService queuePollExecutor;
     private ApplicationListener appListener = new InternalApplicationListener();
 
-    private final Multimap<String, DefaultAsyncConsistentMap> maps = ArrayListMultimap.create();
-    private final Multimap<ApplicationId, DefaultAsyncConsistentMap> mapsByApplication = ArrayListMultimap.create();
+    private final Multimap<String, DefaultAsyncConsistentMap> maps =
+            Multimaps.synchronizedMultimap(ArrayListMultimap.create());
+    private final Multimap<ApplicationId, DefaultAsyncConsistentMap> mapsByApplication =
+            Multimaps.synchronizedMultimap(ArrayListMultimap.create());
     private final Map<String, DefaultDistributedQueue> queues = Maps.newConcurrentMap();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)