commit eba4e3407f1b1863661921a2d629f868d1cf62fc
author Brian O'Connor <bocon@onlab.us> Thu Apr 30 22:50:13 2015 -0700
committer Brian O'Connor <bocon@onlab.us> Fri May 01 12:48:16 2015 -0700
tree 6624e4aef13e7e8cfe1dc09b0b26341f686132d1
parent cdec493d804d83404370f3d0d1560b5f5da8f0dd

Adding tests for IntentCleaner

Also, two small bug fixes for SimpleIntentStore
and one for IntentCleanup

Change-Id: I19c8246dd669d894ba258e04f4f963a97b9a7626

core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
index 46a65ac..7d5417c 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
@@ -128,7 +128,7 @@
         log.info("Settings: period={}", period);
     }
 
-    private void adjustRate() {
+    protected void adjustRate() {
         if (timerTask != null) {
             timerTask.cancel();
         }
@@ -192,15 +192,18 @@
      */
     private void cleanup() {
         int corruptCount = 0, stuckCount = 0, pendingCount = 0;
+        store.getIntentData(true, periodMs);
         for (IntentData intentData : store.getIntentData(true, periodMs)) {
             switch (intentData.state()) {
                 case CORRUPT:
                     resubmitCorrupt(intentData, false);
                     corruptCount++;
+                    break;
                 case INSTALLING: //FALLTHROUGH
                 case WITHDRAWING:
                     resubmitPendingRequest(intentData);
                     stuckCount++;
+                    break;
                 default:
                     //NOOP
                     break;