NPE in SNAT conntrack tempest.

NETVIRT-1359 NPE in SNAT conntrack tempest.

Change-Id: I7213aaaf98823f612a3ddf0bff78bbf9069b2f44
Signed-off-by: Aswin Suryanarayanan <asuryana@redhat.com>

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java
index c405a115fedd65c52afb2848a4600ee88ae99d5a..ccf9dcb2aeb2e160d8e16a36e8eb4e8fe506819a 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java
@@ -581,6 +581,10 @@ public abstract class AbstractSnatService implements SnatServiceListener {
         LOG.info("removeLearntIpPorts for router {} and network {}", routers.getRouterName(), routers.getNetworkId());
         String networkId = routers.getNetworkId().getValue();
         LearntVpnVipToPortData learntVpnVipToPortData = NatUtil.getLearntVpnVipToPortData(dataBroker);
+        if (learntVpnVipToPortData == null) {
+            LOG.info("removeLearntIpPorts, no learned ports present");
+            return;
+        }
         LearntVpnVipToPortDataBuilder learntVpnVipToPortDataBuilder = new LearntVpnVipToPortDataBuilder();
         List<LearntVpnVipToPort> learntVpnVipToPortList = new ArrayList<>();
         for (LearntVpnVipToPort learntVpnVipToPort : learntVpnVipToPortData.getLearntVpnVipToPort()) {