commit ab7e59f3e8a072ba3877150af3d212d37f687df0
author jaegonkim <jaegon77.kim@samsung.com> Mon May 07 13:04:05 2018 +0900
committer Pier Luigi Ventre <pierventre@hotmail.com> Thu May 10 16:53:22 2018 +0000
tree 4220794fb98fb847e5fc530b06ac2ff7c903f56a
parent c03b6bd7d947ddec8c290ec8daa5c752a9aa7444

[ONOS-7646] IntentCleanup.cleanup() overwrites intent operation of pending map with the intent opeation of current map

Change-Id: I98825dc790bee845c4afcf795af13e81d685da1a

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 21c3efc..27f38af 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
@@ -229,16 +229,21 @@
         }
 
         for (IntentData intentData : store.getIntentData(true, periodMs)) {
+            IntentData pendingIntentData = store.getPendingData(intentData.key());
+            if (pendingIntentData != null) {
+                continue;
+            }
+
             switch (intentData.state()) {
                 case FAILED:
                     log.debug("Resubmit Failed Intent: key {}, state {}, request {}",
-                              intentData.key(), intentData.state(), intentData.request());
+                            intentData.key(), intentData.state(), intentData.request());
                     resubmitCorrupt(intentData, false);
                     failedCount++;
                     break;
                 case CORRUPT:
                     log.debug("Resubmit Corrupt Intent: key {}, state {}, request {}",
-                              intentData.key(), intentData.state(), intentData.request());
+                            intentData.key(), intentData.state(), intentData.request());
                     resubmitCorrupt(intentData, false);
                     corruptCount++;
                     break;