| commit | 597934f755eca0cd6afe8da1462d42e64c575b95 | [log] [tgz] |
|---|---|---|
| author | Brian O'Connor <bocon@onlab.us> | Thu Jul 16 11:44:03 2015 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu Jul 16 18:54:24 2015 +0000 |
| tree | 4867d674d0859eac3ecdd2edcc98f002b7656207 | |
| parent | 8040176c31121ea75de6752af75640b4d1b53b87 [diff] |
ONOS-2381 Fixing intent purge command We need to remove the current value. Change-Id: Ib15f9b097e3df096b45367012d067973436e1d85
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentData.java b/core/api/src/main/java/org/onosproject/net/intent/IntentData.java index 6ac200f..e24e14e 100644 --- a/core/api/src/main/java/org/onosproject/net/intent/IntentData.java +++ b/core/api/src/main/java/org/onosproject/net/intent/IntentData.java
@@ -281,6 +281,7 @@ return true; case PURGE_REQ: + // TODO we should enforce that only WITHDRAWN intents can be purged return true; case COMPILING:
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 3d5a5d4..fa3a075 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
@@ -180,7 +180,7 @@ // Only the master is modifying the current state. Therefore assume // this always succeeds if (newData.state() == PURGE_REQ) { - currentMap.remove(newData.key(), newData); + currentMap.remove(newData.key(), currentData); } else { currentMap.put(newData.key(), new IntentData(newData)); }