From 59ece1e29c1ed79fdfb00f5393a6629cb2fdebfd Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Thu, 11 Feb 2016 15:00:03 +0530 Subject: [PATCH] Bug 5315 - NPE while creating Neutron Router w/o interface attached to it Fixes NPE while creating Neutron Router without any interface (subnet) attached to it. Also removes a redundant null check Change-Id: I9490d673c25771036ec93e19b9e9dee50bd53115 Signed-off-by: Abhinav Gupta --- .../vpnservice/neutronvpn/NeutronPortChangeListener.java | 2 +- .../org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronPortChangeListener.java index e88b1be0..9a14c570 100644 --- a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronPortChangeListener.java +++ b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronPortChangeListener.java @@ -268,7 +268,7 @@ public class NeutronPortChangeListener extends AbstractDataChangeListener subnetId = ip.getSubnetId(); Subnetmap subnetmap = nvpnManager.updateSubnetNode(subnetId, null, null, null, null, null, port.getUuid()); - if (vpnId == null && subnetmap != null) { + if (subnetmap != null) { vpnId = subnetmap.getVpnId(); } } diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java index d7adab8b..b23120e4 100644 --- a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java +++ b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java @@ -220,7 +220,7 @@ public class NeutronvpnUtils { if (router != null) { List interfacesList = router.getInterfaces(); - if (!interfacesList.isEmpty()) { + if (interfacesList != null) { for (org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers .router.Interfaces interfaces : interfacesList) { subnetIdList.add(interfaces.getSubnetId()); -- 2.36.6