commit feb271729817682669cadad809ce3b1cda8b2093
author jaegonkim <jaegon77.kim@samsung.com> Mon Jul 09 23:23:10 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Wed Jul 11 01:28:33 2018 +0000
tree 7b4d9fb1803eb5922fc90c29986e43206f4bd1dc
parent a304cb7e56ffd042dd10c8866e7f200024c1d316

[ONOS-7734] ct intent is stucked in WITHDRAWING state for ever after submitting intent withdraw request

Change-Id: I5ebbe2faf3eaad51398bdb07feb3b422a20f8af2
(cherry picked from commit 2e4d99e28e72d3fc109ebc24d953c213014f733f)

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
index 24a833d..396643e 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
@@ -1868,11 +1868,10 @@
 
     protected void processPendingRemoveNextObjs(GroupKey key) {
         pendingRemoveNextObjectives.asMap().forEach((nextObjective, groupKeys) -> {
+            groupKeys.remove(key);
             if (groupKeys.isEmpty()) {
                 pendingRemoveNextObjectives.invalidate(nextObjective);
                 pass(nextObjective);
-            } else {
-                groupKeys.remove(key);
             }
         });
     }