Merge "incorrect filtering of config bbs on"

1 files changed, 10 insertions, 6 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index 5e281cff87..554385d043 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@ -450,14 +450,18 @@ public class WorkflowActionBBTasks {
                 if (requestAction.equalsIgnoreCase("replaceInstance")
                         || requestAction.equalsIgnoreCase("replaceInstanceRetainAssignments")) {
                     List<ExecuteBuildingBlock> configBBs = flowsToExecute.stream()
-                            .filter(item -> !item.getBuildingBlock().getBpmnFlowName().matches(CONFIGURATION_PATTERN))
+                            .filter(item -> item.getBuildingBlock().getBpmnFlowName().matches(CONFIGURATION_PATTERN))
                             .collect(Collectors.toList());
-                    for (ExecuteBuildingBlock bb : configBBs) {
-                        bb.getConfigurationResourceKeys().setCvnfcCustomizationUUID(modelCustomizationId);
-                        bb.getConfigurationResourceKeys().setVnfcName(vnfc.getVnfcName());
+                    if (configBBs != null && configBBs.size() > 0) {
+                        for (ExecuteBuildingBlock bb : configBBs) {
+                            if (bb.getConfigurationResourceKeys() != null) {
+                                bb.getConfigurationResourceKeys().setCvnfcCustomizationUUID(modelCustomizationId);
+                                bb.getConfigurationResourceKeys().setVnfcName(vnfc.getVnfcName());
+                            }
+                        }
+                        execution.setVariable("flowsToExecute", flowsToExecute);
+                        execution.setVariable(COMPLETED, false);
                     }
-                    execution.setVariable("flowsToExecute", flowsToExecute);
-                    execution.setVariable(COMPLETED, false);
                 } else {
                     CvnfcConfigurationCustomization fabricConfig = catalogDbClient.getCvnfcCustomization(
                             serviceModelUUID, vnfCustomizationUUID, vfModuleCustomizationUUID, modelCustomizationId);