commit 2e4d99e28e72d3fc109ebc24d953c213014f733f
author jaegonkim <jaegon77.kim@samsung.com> Mon Jul 09 23:23:10 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Tue Jul 10 23:09:54 2018 +0000
tree ac7b8ec220f9824bb1d889650d6d30255e3b5052
parent cbe1c5ed4b1aaea2afbb34d2f1de9009094d2b9f

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

Change-Id: I5ebbe2faf3eaad51398bdb07feb3b422a20f8af2

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);
             }
         });
     }