From 52e025b94a24c68852def35815d32ef21197513c Mon Sep 17 00:00:00 2001
From: Chetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
Date: Mon, 20 Jul 2020 10:33:39 +0530
Subject: [PATCH] NPE in NeutronFloatingToFixedIpMappingChangeListener

JIRA : NETVIRT-1690

Signed-off-by: Chetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
Change-Id: I83f816520fa87f39ff8b122361cf1b02bc2eb034
Signed-off-by: Chetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
---
 ...ronFloatingToFixedIpMappingChangeListener.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java
index 29f56dcd56..487f0f5a87 100644
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java
@@ -11,6 +11,8 @@ import static org.opendaylight.netvirt.neutronvpn.NeutronvpnUtils.buildfloatingI
 
 import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -162,13 +164,12 @@ public class NeutronFloatingToFixedIpMappingChangeListener extends AbstractAsync
                             .setPortName(fixedNeutronPortName);
                 }
                 if (fixedIpAddress != null) {
-                    List<InternalToExternalPortMap> intExtPortMapList
-                            = new ArrayList<InternalToExternalPortMap>(fixedNeutronPortBuilder
-                            .getInternalToExternalPortMap() != null ? fixedNeutronPortBuilder
-                            .getInternalToExternalPortMap().values() : null);
-                    if (intExtPortMapList == null) {
-                        intExtPortMapList = new ArrayList<>();
-                    }
+                    Collection<InternalToExternalPortMap> intExtPortMapCollection = fixedNeutronPortBuilder
+                        .getInternalToExternalPortMap() != null ? fixedNeutronPortBuilder
+                        .getInternalToExternalPortMap().values() : null;
+                    List<InternalToExternalPortMap> intExtPortMapList =
+                        new ArrayList<InternalToExternalPortMap>(intExtPortMapCollection != null
+                            ? intExtPortMapCollection : Collections.emptyList());
                     InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().withKey(new
                             InternalToExternalPortMapKey(fixedIpAddress)).setInternalIp(fixedIpAddress)
                             .setExternalIp(floatingIpAddress).setExternalId(floatingIpId).build();
-- 
2.36.6