commit 764a71344ae21594b1b8af655631b2f132f351c0
author Thomas Vachuska <tom@onlab.us> Tue Nov 22 17:07:22 2016 -0800
committer Aaron Kruglikov <aaron@onlab.us> Mon Nov 28 22:48:59 2016 +0000
tree 9ef4a1deb7cf2269e06cccb2d9a5bbee04dbe4f4
parent b2fdb742f7581b2ea1c989fcd83ff2cc1204a661

Fixed NPE in persistent map; however the map functionality still appears to be broken.

Change-Id: I599d66c21230675d63871757f115cbcac21a12e5

core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistentMap.java

diff --git a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistentMap.java b/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistentMap.java
index daf594d..23095f4 100644
--- a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistentMap.java
+++ b/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistentMap.java
@@ -118,7 +118,8 @@
     @Override
     public V get(Object key) {
         checkNotNull(key, "Key cannot be null.");
-        return serializer.decode(items.get(serializer.encode(key)));
+        byte[] bytes = items.get(serializer.encode(key));
+        return bytes == null ? null : serializer.decode(bytes);
     }
 
     @Override