Charles Chan
Committed by Gerrit Code Review

Backport bugfix for NPE to onos-1.5

(from commit 04b1fe9a)

Change-Id: Ie2af821e232bc8a1c9d6828c464bf3e54ad8cd11
...@@ -343,7 +343,11 @@ public class DistributedDhcpStore implements DhcpStore { ...@@ -343,7 +343,11 @@ public class DistributedDhcpStore implements DhcpStore {
343 343
344 @Override 344 @Override
345 public IpAssignment getIpAssignmentFromAllocationMap(HostId hostId) { 345 public IpAssignment getIpAssignmentFromAllocationMap(HostId hostId) {
346 - return allocationMap.get(hostId).value(); 346 + if (allocationMap.get(hostId) != null) {
347 + return allocationMap.get(hostId).value();
348 + } else {
349 + return null;
350 + }
347 } 351 }
348 352
349 /** 353 /**
......