commit cdca195585725e78f0837848fda2b60f5b98ab6f
author Devin Lim <devin@opennetworking.org> Wed Mar 28 18:13:33 2018 -0700
committer Jordan Halterman <jordan@opennetworking.org> Fri Mar 30 05:04:55 2018 +0000
tree 6eaf6cee7e94b15852dcacdf518c5d08e1e71a65
parent c2bf02a31c65b7c0c6c5cf5323ef2b075c829276

[ONOS-7565] Flow rules error while rerouting intents with Flow Objectives

Change-Id: I785e2e82cabda23b07816e572ccfde4bed45a3f2

core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java
index 108f380..f998dad 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java
@@ -837,11 +837,11 @@
         }
 
         public void add(FlowEntry rule) {
-            StoredFlowEntry stored = getFlowEntriesInternal(rule.deviceId(), rule.id())
-                .putIfAbsent((StoredFlowEntry) rule, (StoredFlowEntry) rule);
-            if (stored == null) {
-                lastUpdateTimes.put(rule.deviceId(), System.currentTimeMillis());
-            }
+            getFlowEntriesInternal(rule.deviceId(), rule.id())
+                    .compute((StoredFlowEntry) rule, (k, stored) -> {
+                        return (StoredFlowEntry) rule;
+                    });
+            lastUpdateTimes.put(rule.deviceId(), System.currentTimeMillis());
         }
 
         public void update(FlowEntry rule) {