commit 1cef740e07b21f8b9bfaada5e1dd057de6345e79
author Devin Lim <devin@opennetworking.org> Wed Mar 28 18:19:57 2018 -0700
committer Devin Lim <devin@opennetworking.org> Wed Mar 28 18:45:24 2018 -0700
tree 5b5ef90c386075f49a701b6f16a0d162af1cfb7e
parent 95da6491db769b90120eb2638c76cca2ac418289

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

Change-Id: Ic16a74b38c9a3c263fae6115ee70ed3790a9d690

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) {