commit 4400853c6e8302aab4538ecc35e9f1ef6a89577e
author Brian O'Connor <bocon@onlab.us> Thu Dec 04 16:41:36 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Dec 05 00:59:46 2014 +0000
tree c7ffc3953ad7177344caa804219d684d3f64af1e
parent 4785eec52935b19880c7cfae7bbbb5efad12b7b5

cleaning up some TODOs

Change-Id: Ib2380e9533ba30c6f9fdf79aed1879dbbe3589a7

core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java
index 3f52cd1..085e9b7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java
@@ -88,7 +88,7 @@
     private IntentBatchDelegate delegate;
     private InternalLeaderListener leaderListener = new InternalLeaderListener();
     private final Map<ApplicationId, SQueue<IntentOperations>> batchQueues
-            = Maps.newHashMap(); // FIXME make distributed?
+            = Maps.newHashMap();
     private final Set<ApplicationId> myTopics = Sets.newHashSet();
     private final Map<ApplicationId, IntentOperations> outstandingOps
             = Maps.newHashMap();
@@ -158,7 +158,7 @@
     public void addIntentOperations(IntentOperations ops) {
         checkNotNull(ops, "Intent operations cannot be null.");
         ApplicationId appId = ops.appId();
-        getQueue(appId).add(ops); // TODO consider using put here
+        getQueue(appId).add(ops);
         dispatchNextOperation(appId);
     }
 
@@ -175,7 +175,6 @@
                 log.warn("Operation {} not found", ops);
             }
             SQueue<IntentOperations> queue = batchQueues.get(appId);
-            // TODO consider alternatives to remove
             checkState(queue.remove().equals(ops),
                        "Operations are wrong.");
             outstandingOps.remove(appId);
@@ -214,7 +213,6 @@
      */
     private void leaderChanged(String topic, boolean leader) {
         ApplicationId appId = getAppId(topic);
-        //TODO we are using the event caller's thread, should we use our own?
         synchronized (this) {
             if (leader) {
                 myTopics.add(appId);