2 files changed, 3 insertions, 3 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index e686fc2fb5..488b4aab41 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@ -640,7 +640,8 @@ public class BBInputSetup implements JavaDelegate {
                     // want
                     .findAny() // If 'findAny' then return found
                     .orElse(null);
-        } else {
+        }
+        if (vfResourceCustomization == null) {
             vfResourceCustomization = bbInputSetupUtils
                     .getVfModuleCustomizationByModelCuztomizationUUID(modelInfo.getModelCustomizationId());
         }
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index 21b0d834dd..be9965b5b7 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -2947,7 +2947,7 @@ public class BBInputSetupTest {
     }
 
     @Test
-    public void testMapCatalogVfModuleIfNoVnf() {
+    public void testMapCatalogVfModuleIfNoVfUnderVnf() {
         String vnfModelCustomizationUUID = "vnfResourceCustUUID";
         String vfModuleCustomizationUUID = "vfModelCustomizationUUID";
         VfModule vfModule = new VfModule();
@@ -2958,7 +2958,6 @@ public class BBInputSetupTest {
         vnfResourceCust.setModelCustomizationUUID(vnfModelCustomizationUUID);
         VfModuleCustomization vfModuleCust = new VfModuleCustomization();
         vfModuleCust.setModelCustomizationUUID(vfModuleCustomizationUUID);
-        vnfResourceCust.getVfModuleCustomizations().add(vfModuleCust);
         ModelInfoVfModule modelInfoVfModule = new ModelInfoVfModule();
         doReturn(vfModuleCust).when(SPY_bbInputSetupUtils)
                 .getVfModuleCustomizationByModelCuztomizationUUID(vfModuleCustomizationUUID);