commit 9789311cd4717b0cb6ffb628b23501591fe710bd
author Pier Luigi <pierventre@hotmail.com> Mon Mar 05 11:09:42 2018 +0100
committer Thomas Vachuska <tom@opennetworking.org> Tue Mar 06 18:40:49 2018 +0000
tree 7df7c19484f1b710425315980e41533ff7aeb1d2
parent 909cff811153eb8583916b3b6ac54b7055e4ca78

[CORD-2802] Fix events reordering in FlowObjectiveManager

Change-Id: I5fac27240eac0c182d565ab84e9d8209f4e8d2ce

core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
index b877ef8..fdba591 100644
--- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.flowobjective.impl;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -252,7 +253,6 @@
     public void forward(DeviceId deviceId, ForwardingObjective forwardingObjective) {
         checkPermission(FLOWRULE_WRITE);
         if (forwardingObjective.nextId() == null ||
-                forwardingObjective.op() == Objective.Operation.REMOVE ||
                 flowObjectiveStore.getNextGroup(forwardingObjective.nextId()) != null ||
                 !queueFwdObjective(deviceId, forwardingObjective)) {
             // fast path
@@ -290,7 +290,7 @@
                 pendingForwards.compute(fwd.nextId(), (id, pending) -> {
                     PendingFlowObjective pendfo = new PendingFlowObjective(deviceId, fwd);
                     if (pending == null) {
-                        return Sets.newHashSet(pendfo);
+                        return Sets.newLinkedHashSet(ImmutableSet.of(pendfo));
                     } else {
                         pending.add(pendfo);
                         return pending;