홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Gerrit Code Review
7c4e09ab 1 parent a4f3165b

Bug fix: Removing an non-existing key from map should be a noop 

Change-Id: I1a89327ab6b0a498fe403f17cbdb8783c41954a6
Inline Side-by-side
Showing 1 changed file with 7 additions and 3 deletions
......@@ -151,9 +151,13 @@ public class DefaultDatabaseState implements DatabaseState<String, byte[]> {
!versionMatch.matches(currentValue == null ? null : currentValue.version())) {
return Result.ok(new UpdateResult<>(false, mapName, key, currentValue, currentValue));
} else {
if (value == null && currentValue != null) {
getMap(mapName).remove(key);
return Result.ok(new UpdateResult<>(true, mapName, key, currentValue, null));
if (value == null) {
if (currentValue == null) {
return Result.ok(new UpdateResult<>(false, mapName, key, null, null));
} else {
getMap(mapName).remove(key);
return Result.ok(new UpdateResult<>(true, mapName, key, currentValue, null));
}
}
Versioned<byte[]> newValue = new Versioned<>(value, ++nextVersion);
getMap(mapName).put(key, newValue);
......