From: Tali <tali.ben-meir@hpe.com>
Date: Wed, 1 Mar 2017 16:58:29 +0000 (+0200)
Subject: Fix NPE from VpnDpnToTransportZoneListener
X-Git-Tag: release/carbon~340
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8b801783ccffcad1be5e50da889cefb94afb2dad;p=netvirt.git

Fix NPE from VpnDpnToTransportZoneListener

Change-Id: If4badb0de9733694d9397220e239a1fa9a4cd918
Signed-off-by: Tali <tali.ben-meir@hpe.com>
---

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java
index 7fe4efe0fc..c7ce63ee86 100644
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java
@@ -65,7 +65,7 @@ public class VpnDpnToTransportZoneListener
         }
 
         boolean shouldCreateVtep;
-        if (original.getVpnInterfaces() != null || original.getVpnInterfaces().isEmpty()) {
+        if (original.getVpnInterfaces() != null && !original.getVpnInterfaces().isEmpty()) {
             shouldCreateVtep = transportZoneNotificationUtil.shouldCreateVtep(update.getVpnInterfaces().stream()
                     .filter(vi -> !original.getVpnInterfaces().contains(vi)).collect(Collectors.toList()));
         } else {