Bug 6716:Fix NPE in NeutronvpnNatManager

Change-Id: If77b4ae30eb8e4608da571153f3dfdf28649d853
Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
index 1689882360e71b8f460487d072d68a9353b4ed6e..204b3fe92ffc2cffd9c43cc950b7dc469cae4e08 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java
@@ -145,11 +145,11 @@ public class NeutronvpnNatManager implements AutoCloseable {
     private boolean snatSettingChanged(Router orig, Router update) {
         ExternalGatewayInfo orig_ext_gw = null;
         ExternalGatewayInfo new_ext_gw = null;
-        if (orig.getExternalGatewayInfo() != null) {
+        if (orig != null && orig.getExternalGatewayInfo() != null) {
             orig_ext_gw = orig.getExternalGatewayInfo();
         }
 
-        if (update.getExternalGatewayInfo() != null) {
+        if (update != null && update.getExternalGatewayInfo() != null) {
             new_ext_gw = update.getExternalGatewayInfo();
         }
 
@@ -165,11 +165,11 @@ public class NeutronvpnNatManager implements AutoCloseable {
     private boolean externalFixedIpsChanged(Router orig, Router update) {
         ExternalGatewayInfo orig_ext_gw = null;
         ExternalGatewayInfo new_ext_gw = null;
-        if (orig.getExternalGatewayInfo() != null) {
+        if (orig != null && orig.getExternalGatewayInfo() != null) {
             orig_ext_gw = orig.getExternalGatewayInfo();
         }
 
-        if (update.getExternalGatewayInfo() != null) {
+        if (update != null && update.getExternalGatewayInfo() != null) {
             new_ext_gw = update.getExternalGatewayInfo();
         }