commit c92a6f75b3a6cd42cd15d670c011f6d31eb315b8
author jaegonkim <jaegon77.kim@samsung.com> Mon Jul 09 23:23:10 2018 +0900
committer Charles Chan <rascov@gmail.com> Tue Jul 10 16:22:59 2018 -0700
tree 13b32f935d274853780cad383f5f03d90785a8d9
parent 140766e1e8a73895af9072a97e1814b5122d49ac

[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 6765b3e..24cf6c9 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
@@ -1867,11 +1867,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);
             }
         });
     }