From 17acfdbd6283b95f77e02539795af3d707404981 Mon Sep 17 00:00:00 2001
From: Sam Hague <shague@redhat.com>
Date: Tue, 26 Sep 2017 17:54:23 -0400
Subject: [PATCH] bug-9190: NullPointerException at getIsExternal

Change-Id: I2e95c71594798431259f10631cef514ef410c199
Signed-off-by: Sam Hague <shague@redhat.com>
---
 .../netvirt/vpnmanager/SubnetmapChangeListener.java             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java
index 90e4d96c30..3671646c7d 100644
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetmapChangeListener.java
@@ -70,6 +70,7 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
             if (network == null) {
                 LOG.info("update: vpnId {}, networkId: {}, subnetId: {}: network was not found",
                     vpnId.getValue(), subnetmap.getNetworkId().getValue(), subnetId.getValue());
+                return;
             }
             if (VpnUtil.getIsExternal(network)) {
                 return;
@@ -111,6 +112,7 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
         if (network == null) {
             LOG.info("update: vpnIdNew: {}, vpnIdOld: {}, networkId: {}, subnetId: {}: network was not found",
                 vpnIdNew.getValue(), vpnIdOld.getValue(), elanInstanceName, subnetId.getValue());
+            return;
         }
         if (VpnUtil.getIsExternal(network)) {
             return;
-- 
2.36.6