Merge "Fix rollback for ConfigAssignBB"

1 files changed, 6 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 100f81a0c7..d5798150d1 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
@@ -290,12 +290,12 @@ public class WorkflowActionBBTasks {
                     flowsToExecute.remove(i);
                 } else {
                     String flowName = flowsToExecute.get(i).getBuildingBlock().getBpmnFlowName();
-                    if (flowName.contains("Assign")) {
-                        flowName = "Unassign" + flowName.substring(6, flowName.length());
-                    } else if (flowName.contains("Create")) {
-                        flowName = "Delete" + flowName.substring(6, flowName.length());
-                    } else if (flowName.contains("Activate")) {
-                        flowName = "Deactivate" + flowName.substring(8, flowName.length());
+                    if (flowName.startsWith("Assign")) {
+                        flowName = flowName.replaceFirst("Assign", "Unassign");
+                    } else if (flowName.startsWith("Create")) {
+                        flowName = flowName.replaceFirst("Create", "Delete");
+                    } else if (flowName.startsWith("Activate")) {
+                        flowName = flowName.replaceFirst("Activate", "Deactivate");
                     } else {
                         continue;
                     }