DistributedFlowRuleStore: always add FlowEntry on batchStore

related to ONOS-481 Change-Id: I9f82c7d9736dab7326062af9c38ae6e290a9b818

DistributedFlowRuleStore: always add FlowEntry on batchStore
related to ONOS-481 Change-Id: I9f82c7d9736dab7326062af9c38ae6e290a9b818
Yuta HIGUCHI · Yuta Higuchi
Commit 08f156b45e2ff1e225082d47b7c36edfffa75971 08f156b4 1 parent 420691ac
Showing 1 changed file with 7 additions and 4 deletions
core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
View file @08f156b
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
View file @08f156b
@@ -417,10 +417,13 @@ public class DistributedFlowRuleStore
                 } else if (op.equals(FlowRuleOperation.ADD)) {
                     StoredFlowEntry flowEntry = new DefaultFlowEntry(flowRule);
                     DeviceId deviceId = flowRule.deviceId();
-                     if (!flowEntries.containsEntry(deviceId, flowEntry)) {
-                         flowEntries.put(deviceId, flowEntry);
-                         toAdd.add(batchEntry);
-                     }
+                     Collection<StoredFlowEntry> ft = flowEntries.get(deviceId);
+ 
+                     // always add requested FlowRule
+                     // Note: 2 equal FlowEntry may have different treatment
+                     ft.remove(flowEntry);
+                     ft.add(flowEntry);
+                     toAdd.add(batchEntry);
                 }
             }
             if (toAdd.isEmpty() && toRemove.isEmpty()) {