commit 4922a060973990233d7d2376f28ba5db270a08b8
author Jordan Halterman <jordan@opennetworking.org> Mon Jul 31 15:55:36 2017 -0700
committer Ray Milkey <ray@opennetworking.org> Mon Aug 14 21:12:27 2017 +0000
tree 1a5326c98cb813caefca28e6f3cbedde78abe498
parent 4beea653817c1368c873c8c2c8a965d8bc4b987a

[ONOS-6874] Implement nullable ConsistentMap

Change-Id: I82a232d376b230b06977b24f12364aa374c9c113

core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultConsistentMapBuilder.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultConsistentMapBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultConsistentMapBuilder.java
index 32a7506..2bc06dd 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultConsistentMapBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/DefaultConsistentMapBuilder.java
@@ -42,6 +42,7 @@
     @Override
     public AsyncConsistentMap<K, V> buildAsyncMap() {
         AsyncConsistentMap<K, V> map = primitiveCreator.newAsyncConsistentMap(name(), serializer());
+        map = nullValues() ? map : DistributedPrimitives.newNotNullMap(map);
         map = relaxedReadConsistency() ? DistributedPrimitives.newCachingMap(map) : map;
         map = readOnly() ? DistributedPrimitives.newUnmodifiableMap(map) : map;
         return meteringEnabled() ? DistributedPrimitives.newMeteredMap(map) : map;