Bug 5315 - NPE while creating Neutron Router w/o interface attached to it

[vpnservice.git] / neutronvpn / neutronvpn-impl / src / main / java / org / opendaylight / vpnservice / neutronvpn / NeutronPortChangeListener.java

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 e88b1be08748c2b1f31dc323e2433eedd9423078..9a14c570bf505181b97c7c29dff8633dddf8ad07 100644 (file)
--- 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<Port>
 
             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();
             }
         }