commit 31764d579eebeba5dab76a6528c5fe3d6e9eeae1
author Yi Tseng <yi@opennetworking.org> Mon Oct 02 14:27:24 2017 -0700
committer Yi Tseng <yi@opennetworking.org> Tue Oct 03 20:48:54 2017 +0000
tree 18ee220f1bb83dd2b2d4bc609b66092f80119fb6
parent c54f5f144847227060736c911e1352f27d072514

[CORD-1925] Fix null pointer exception in DHCP relay store

NPE happened when remove DHCP record

Change-Id: I4b4c564d086c4e274aefa0ebce5d52cd622596d0
(cherry picked from commit 15813842f02e0410d9a7630362ea9adddcdf30ef)

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
index 1e87ba6..38c0580 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
@@ -66,7 +66,13 @@
     protected void activated() {
         dhcpRecords = storageService.<HostId, DhcpRecord>eventuallyConsistentMapBuilder()
                 .withName("DHCP-Relay-Records")
-                .withTimestampProvider((hostId, record) -> new WallClockTimestamp(record.lastSeen()))
+                .withTimestampProvider((hostId, record) -> {
+                    if (record != null) {
+                        return new WallClockTimestamp(record.lastSeen());
+                    } else {
+                        return new WallClockTimestamp();
+                    }
+                })
                 .withSerializer(APP_KRYO)
                 .build();
         listener = new InternalMapListener();