From fc2bd161cb694f426d0f02e8b322870177036f7f Mon Sep 17 00:00:00 2001
From: MichaelMorris <michael.morris@est.tech>
Date: Thu, 24 Mar 2022 10:53:48 +0000
Subject: [PATCH] Fix NPE in service import logic for service filters

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3939
Change-Id: I2faedf1654db5073dffd4b711cdf8657a63a74a7
(cherry picked from commit 8c565b9d5396e86d431f51952b476007ff4fbe8e)
---
 .../org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java
index a5db57287f..29758b6bc5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java
@@ -1384,7 +1384,7 @@ public class ServiceImportParseLogic {
     public Service createSubstitutionFilterOnService(Service service,
                                                      ListDataDefinition<RequirementSubstitutionFilterPropertyDataDefinition> substitutionFilterProperties)
         throws BusinessLogicException {
-        if (substitutionFilterProperties.isEmpty()) {
+        if (substitutionFilterProperties == null || substitutionFilterProperties.isEmpty()) {
             return service;
         }
         substitutionFilterBusinessLogic.addSubstitutionFilterInGraph(service.getUniqueId(), substitutionFilterProperties);
-- 
2.16.6