commit b914fcb0da39313b969803d89326280560536b78
author jaegonkim <jaegon77.kim@samsung.com> Sun May 20 16:04:06 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Tue Jul 10 23:08:51 2018 +0000
tree 2506fd0ec1fa2a76365bf271f46ac320691c51c8
parent a9acf7a2ceed0f941d6f6759cdf18432457f14b2

[ONOS-7682] IntentManager.buildAndSubmitBatches overwrites intent operation of pending map with the intent opeation of current map

Change-Id: If5fd87f8caf14b4a668c78db2cd3999aa917cc54

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

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 35876d6..62752e7 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -469,6 +469,9 @@
             if (intent == null) {
                 continue;
             }
+            if (store.getPendingData(key) != null) {
+                continue;
+            }
             submit(intent);
         }
 
@@ -478,6 +481,9 @@
                 if (!store.isMaster(intent.key())) {
                     continue;
                 }
+                if (store.getPendingData(intent.key()) != null) {
+                    continue;
+                }
                 IntentState state = getIntentState(intent.key());
                 if (RECOMPILE.contains(state) || intentAllowsPartialFailure(intent)) {
                     if (WITHDRAW.contains(state)) {