Fix NPE caused by ElanServiceProvider

[netvirt.git] / vpnservice / dhcpservice / dhcpservice-impl / src / main / java / org / opendaylight / yang / gen / v1 / urn / opendaylight / params / xml / ns / yang / dhcpservice / impl / rev150710 / DhcpServiceImplModule.java

diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dhcpservice/impl/rev150710/DhcpServiceImplModule.java b/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dhcpservice/impl/rev150710/DhcpServiceImplModule.java
index 6dc1a59c611ade8766d03c6d4cd839ef44cbad1b..773e66c06e0d78221e183e465f88dd5f699f7045 100644 (file)
--- a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dhcpservice/impl/rev150710/DhcpServiceImplModule.java
+++ b/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/dhcpservice/impl/rev150710/DhcpServiceImplModule.java
@@ -26,10 +26,11 @@ public class DhcpServiceImplModule extends org.opendaylight.yang.gen.v1.urn.open
         dhcpProvider.setControllerDhcpEnabled(getControllerDhcpEnabled());
         dhcpProvider.setNotificationProviderService(getNotificationServiceDependency());
         dhcpProvider.setMdsalManager(getMdsalutilDependency());
-        dhcpProvider.setNeutronVpnManager(getNeutronvpnDependency());
+        //dhcpProvider.setNeutronVpnManager(getNeutronvpnDependency());
         dhcpProvider.setInterfaceManagerRpc(rpcregistryDependency.getRpcService(OdlInterfaceRpcService.class));
         dhcpProvider.setItmRpcService(rpcregistryDependency.getRpcService(ItmRpcService.class));
         dhcpProvider.setEntityOwnershipService(getEntityOwnershipServiceDependency());
+        dhcpProvider.setInterfaceManager(getOdlinterfaceDependency());
         getBrokerDependency().registerProvider(dhcpProvider);
         return dhcpProvider;
     }