commit | bcd37b3a8b3ba9f331c2350fb564f4e49daa8e9b | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Mon Jun 13 19:41:52 2016 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Tue Jun 14 03:19:01 2016 +0000 |
tree | f7555d51a22faf34fe06badeda81857d8789cb28 | |
parent | b7ed09ad492a34317bd63ea0806058f0cc5f3aa7 [diff] |
ONOS-4656 Addressing issue where intents get stuck in PURGE_REQ state. Change-Id: I223ff14856fadb8d6e913883b42a5e53bbbbc6db
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java index 4583be2..122a368 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -177,8 +177,12 @@ if (IntentData.isUpdateAcceptable(currentData, newData)) { // Only the master is modifying the current state. Therefore assume // this always succeeds - if (newData.state() == PURGE_REQ && currentData != null) { - currentMap.remove(newData.key(), currentData); + if (newData.state() == PURGE_REQ) { + if (currentData != null) { + currentMap.remove(newData.key(), currentData); + } else { + log.info("Gratuitous purge request for intent: {}", newData.key()); + } } else { currentMap.put(newData.key(), new IntentData(newData)); }