Backport bugfix for NPE to onos-1.5

(from commit 04b1fe9a) Change-Id: Ie2af821e232bc8a1c9d6828c464bf3e54ad8cd11

Backport bugfix for NPE to onos-1.5
(from commit 04b1fe9a) Change-Id: Ie2af821e232bc8a1c9d6828c464bf3e54ad8cd11
Charles Chan · Gerrit Code Review
Commit 0cf9e346d693db75136e1069afe348d2272cef68 0cf9e346 1 parent d25d6963
Showing 1 changed file with 5 additions and 1 deletions
apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
--- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
View file @0cf9e34
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
View file @0cf9e34
@@ -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;
+         }
     }
 
     /**