X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dhcpservice%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Fdhcpservice%2FDhcpManager.java;h=f4e7d635a6ce1af366a7a1f11cdd7e5596039318;hb=63326034b6e13412559b3185d8f2bcc068e142ac;hp=1cceea892b8142c1881f3243377ad18cbdbd8203;hpb=109e8de722fbf0608a026dbbe151c3ff7fab5950;p=netvirt.git

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java
index 1cceea892b..f4e7d635a6 100644
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpManager.java
@@ -151,7 +151,7 @@ public class DhcpManager {
     public Subnet getNeutronSubnet(Port port) {
         if (port != null) {
             // DHCP Service is only interested in IPv4 IPs/Subnets
-            return getNeutronSubnet(new ArrayList<FixedIps>(port.getFixedIps().values()));
+            return getNeutronSubnet(new ArrayList<FixedIps>(port.nonnullFixedIps().values()));
         }
         return null;
     }