commit 18ab8a9fc267fa6ce1907210592338077fa33846
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 13 11:16:19 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 13 12:01:11 2014 -0700
tree 749416d3f3248ee9075c7ee2f4c8892cc35f1d22
parent 92cd51e5fa18cdf96eb5b40bb3205f254cd08ccf

modified LinkKey creation to follow other id objects

Change-Id: Ie70444f9069486d0251482464595f5835cf12539

core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java
index d84c367..7ba4e26 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java
@@ -28,6 +28,7 @@
 import static com.google.common.collect.Multimaps.synchronizedSetMultimap;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static org.onlab.onos.net.link.LinkEvent.Type.LINK_REMOVED;
+import static org.onlab.onos.net.LinkKey.linkKey;
 import static org.onlab.util.Tools.namedThreads;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -82,14 +83,14 @@
     @Override
     public void addTrackedResources(IntentId intentId, Collection<Link> resources) {
         for (Link link : resources) {
-            intentsByLink.put(new LinkKey(link), intentId);
+            intentsByLink.put(linkKey(link), intentId);
         }
     }
 
     @Override
     public void removeTrackedResources(IntentId intentId, Collection<Link> resources) {
         for (Link link : resources) {
-            intentsByLink.remove(new LinkKey(link), intentId);
+            intentsByLink.remove(linkKey(link), intentId);
         }
     }
 
@@ -125,7 +126,7 @@
                     if (reason instanceof LinkEvent) {
                         LinkEvent linkEvent = (LinkEvent) reason;
                         if (linkEvent.type() == LINK_REMOVED) {
-                            Set<IntentId> intentIds = intentsByLink.get(new LinkKey(linkEvent.subject()));
+                            Set<IntentId> intentIds = intentsByLink.get(linkKey(linkEvent.subject()));
                             toBeRecompiled.addAll(intentIds);
                         }
                         recompileOnly = recompileOnly && linkEvent.type() == LINK_REMOVED;