commit 7e0e2e6aa53664736bb277788f367de541d20711
author Charles Chan <rascov@gmail.com> Fri Apr 15 16:30:41 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 18 01:13:36 2016 +0000
tree 52af3d0f82b57a66508c177b79ce3c80632a82b0
parent caad26b86f260db2a929ea7d44b6ed010f73297c

Fix NPE in NetworkConfigHostProvider

Change-Id: I89ca7328abdbb06d75ea3840d6606835584eaddc

providers/netcfghost/src/main/java/org/onosproject/provider/netcfghost/NetworkConfigHostProvider.java

diff --git a/providers/netcfghost/src/main/java/org/onosproject/provider/netcfghost/NetworkConfigHostProvider.java b/providers/netcfghost/src/main/java/org/onosproject/provider/netcfghost/NetworkConfigHostProvider.java
index 972b687..41e39dd 100644
--- a/providers/netcfghost/src/main/java/org/onosproject/provider/netcfghost/NetworkConfigHostProvider.java
+++ b/providers/netcfghost/src/main/java/org/onosproject/provider/netcfghost/NetworkConfigHostProvider.java
@@ -110,7 +110,9 @@
      */
     protected void addHost(MacAddress mac, VlanId vlan, HostLocation hloc, Set<IpAddress> ips) {
         HostId hid = HostId.hostId(mac, vlan);
-        HostDescription desc = new DefaultHostDescription(mac, vlan, hloc, ips);
+        HostDescription desc = (ips != null) ?
+                new DefaultHostDescription(mac, vlan, hloc, ips) :
+                new DefaultHostDescription(mac, vlan, hloc);
         providerService.hostDetected(hid, desc, false);
     }