ONOS-2292: Use the passed in value to generate timestamp in ECMap's remove(key, value) method
Change-Id: Ic2fe04a72d8f9c63431ee48a4d0b78005b694142
diff --git a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
index c20016b..1520059 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
@@ -313,6 +313,7 @@
public V remove(K key) {
checkState(!destroyed, destroyedMessage);
checkNotNull(key, ERROR_NULL_KEY);
+ // TODO prevent calls here if value is important for timestamp
MapValue<V> tombstone = new MapValue<>(null, timestampProvider.apply(key, null));
MapValue<V> previousValue = removeInternal(key, Optional.empty(), tombstone);
return previousValue != null ? previousValue.get() : null;
@@ -323,7 +324,7 @@
checkState(!destroyed, destroyedMessage);
checkNotNull(key, ERROR_NULL_KEY);
checkNotNull(value, ERROR_NULL_VALUE);
- MapValue<V> tombstone = new MapValue<>(null, timestampProvider.apply(key, null));
+ MapValue<V> tombstone = new MapValue<>(null, timestampProvider.apply(key, value));
removeInternal(key, Optional.of(value), tombstone);
}