commit b9125562d44bdec21da1614824eb790dc927a108
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Dec 01 23:28:22 2014 -0800
committer Yuta Higuchi <y-higuchi@onlab.us> Tue Dec 02 08:24:17 2014 +0000
tree 9d1281e1c44adc1c38c55991c55c39f69fa0b87f
parent 7a71d5da7b16ca3436b0fc8b9a4b1658e52e134b

GossipLinkStore: removedLinks could be accessed concurrently by advertisement

Change-Id: I64cc3c5614182b6d6a8c2bf1dfa99e3f25fb9817

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 2a60120..0332a7e 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
@@ -19,7 +19,6 @@
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
 import com.google.common.collect.SetMultimap;
 
 import org.apache.commons.lang3.RandomUtils;
@@ -118,7 +117,7 @@
     private final SetMultimap<DeviceId, LinkKey> dstLinks = createSynchronizedHashMultiMap();
 
     // Remove links
-    private final Map<LinkKey, Timestamp> removedLinks = Maps.newHashMap();
+    private final Map<LinkKey, Timestamp> removedLinks = new ConcurrentHashMap<>();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DeviceClockService deviceClockService;