ONOS-4656 Addressing issue where intents get stuck in PURGE_REQ state.

Change-Id: I223ff14856fadb8d6e913883b42a5e53bbbbc6db

ONOS-4656 Addressing issue where intents get stuck in PURGE_REQ state.
Change-Id: I223ff14856fadb8d6e913883b42a5e53bbbbc6db
Thomas Vachuska · Gerrit Code Review
Commit bcd37b3a8b3ba9f331c2350fb564f4e49daa8e9b bcd37b3a 1 parent b7ed09ad
Showing 1 changed file with 6 additions and 2 deletions
core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
View file @bcd37b3
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
View file @bcd37b3
@@ -177,8 +177,12 @@ public class GossipIntentStore
         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) {
+            if (newData.state() == PURGE_REQ) {
-                currentMap.remove(newData.key(), currentData);
+                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));
             }