commit 0cf9e346d693db75136e1069afe348d2272cef68
author Charles Chan <rascov@gmail.com> Thu Jun 16 20:43:19 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jun 17 17:59:58 2016 +0000
tree 16833d0e642a4aaeb1ef80e9990948264cfc9c31
parent d25d6963da9bba772ad25a22a691912a029850d8

Backport bugfix for NPE to onos-1.5

(from commit 04b1fe9adab1382e89a743174b40505f900cd6b9)

Change-Id: Ie2af821e232bc8a1c9d6828c464bf3e54ad8cd11

apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java

diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
index 8c880a5..126cb8d 100644
--- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
@@ -343,7 +343,11 @@
 
     @Override
     public IpAssignment getIpAssignmentFromAllocationMap(HostId hostId) {
-        return allocationMap.get(hostId).value();
+        if (allocationMap.get(hostId) != null) {
+            return allocationMap.get(hostId).value();
+        } else {
+            return null;
+        }
     }
 
     /**