commit 7a43d5bfe9102d8a2dd5f13add2d0274628f20fe
author Yuta HIGUCHI <y-higuchi@onlab.us> Tue Apr 15 14:08:17 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Tue Apr 15 14:43:20 2014 -0700
tree 595f6b9f9ccb75e33321369b6180b10c5c2f7f42
parent b15c8b09792ee03fc04a124974cc474b58e82946

bug fix: NPE in hazelcast multiRead

- Correctly handle value does not exist in table error case.

Change-Id: I4d3c190f7fdeca29723fda7d8fb1a060a11e289d

src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java

diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java
index 0a7fc5e..d3df22c 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZMultiEntryOperation.java
@@ -124,9 +124,14 @@
     private VersionedValue get() {
         try {
             VersionedValue value = future.get();
-            setValue(value.getValue(), value.getVersion());
-            setStatus(STATUS.SUCCESS);
-            return value;
+            if (value == null) {
+                setStatus(STATUS.FAILED);
+                return null;
+            } else {
+                setValue(value.getValue(), value.getVersion());
+                setStatus(STATUS.SUCCESS);
+                return value;
+            }
         } catch (CancellationException | InterruptedException | ExecutionException e) {
             log.error(this + " has failed.", e);
             setStatus(STATUS.FAILED);