From 0cf9e346d693db75136e1069afe348d2272cef68 Mon Sep 17 00:00:00 2001
From: Charles Chan <rascov@gmail.com>
Date: Thu, 16 Jun 2016 20:43:19 -0700
Subject: [PATCH] Backport bugfix for NPE to onos-1.5

(from commit 04b1fe9adab1382e89a743174b40505f900cd6b9)

Change-Id: Ie2af821e232bc8a1c9d6828c464bf3e54ad8cd11
---
 .../org/onosproject/dhcp/impl/DistributedDhcpStore.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 8c880a5102..126cb8da7a 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 @@ public class DistributedDhcpStore implements DhcpStore {
 
     @Override
     public IpAssignment getIpAssignmentFromAllocationMap(HostId hostId) {
-        return allocationMap.get(hostId).value();
+        if (allocationMap.get(hostId) != null) {
+            return allocationMap.get(hostId).value();
+        } else {
+            return null;
+        }
     }
 
     /**