commit 990aecc26aa06e3c964c3a2bb6adc33bbd7eec2d
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 13 22:21:42 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 13 22:21:42 2014 -0700
tree 735ee83ceeb3c3afc474bf249fe90b663b2020b1
parent bbfc96a9c9cf699872cf7b4aea9c7772b17f07b6

eliminate package dependency cycle

Change-Id: I7c30e5db9f5d17d24d28252b4dc58ce23835b6d8

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 e59d65d..ce39c5b 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
@@ -238,7 +238,7 @@
 
         final Timestamped<LinkDescription> deltaDesc = new Timestamped<>(linkDescription, newTimestamp);
 
-        LinkKey key = linkKey(linkDescription);
+        LinkKey key = linkKey(linkDescription.src(), linkDescription.dst());
         final LinkEvent event;
         final Timestamped<LinkDescription> mergedDesc;
         synchronized (getLinkDescriptions(key)) {
@@ -265,7 +265,8 @@
             ProviderId providerId,
             Timestamped<LinkDescription> linkDescription) {
 
-        LinkKey key = linkKey(linkDescription.value());
+        LinkKey key = linkKey(linkDescription.value().src(),
+                              linkDescription.value().dst());
         ConcurrentMap<ProviderId, Timestamped<LinkDescription>> descs = getLinkDescriptions(key);
 
         synchronized (descs) {