Merge "ensure default flags are set on execution"

2 files changed, 10 insertions, 2 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
index 561ae55ae1..5d95f973bf 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
@@ -178,6 +178,7 @@ public class WorkflowAction {
 
     public void selectExecutionList(DelegateExecution execution) throws Exception {
         try {
+            fillExecutionDefault(execution);
             final String bpmnRequest = (String) execution.getVariable(BBConstants.G_BPMN_REQUEST);
             ServiceInstancesRequest sIRequest =
                     new ObjectMapper().readValue(bpmnRequest, ServiceInstancesRequest.class);
@@ -1874,12 +1875,15 @@ public class WorkflowAction {
         return generatedResourceId;
     }
 
-    private void fillExecution(DelegateExecution execution, boolean suppressRollback, String resourceId,
-            WorkflowType resourceType) {
+    private void fillExecutionDefault(DelegateExecution execution) {
         execution.setVariable("sentSyncResponse", false);
         execution.setVariable(HOMING, false);
         execution.setVariable("calledHoming", false);
         execution.setVariable(BBConstants.G_ISTOPLEVELFLOW, true);
+    }
+
+    private void fillExecution(DelegateExecution execution, boolean suppressRollback, String resourceId,
+            WorkflowType resourceType) {
         execution.setVariable("suppressRollback", suppressRollback);
         execution.setVariable("resourceId", resourceId);
         execution.setVariable("resourceType", resourceType);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 50ff074866..7f22c5138e 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -243,6 +243,10 @@ public class WorkflowActionTest extends BaseTaskTest {
         SPY_workflowAction.selectExecutionList(execution);
         assertEquals(execution.getVariable("WorkflowActionErrorMessage"),
                 "Exception while setting execution list. serviceInstance with name (instanceName) and different version id (3c40d244-808e-42ca-b09a-256d83d19d0a) already exists. The name must be unique.");
+
+        // verify default values are present in failure case
+        assertEquals(true, execution.getVariable("isTopLevelFlow"));
+        assertEquals(false, execution.getVariable("sentSyncResponse"));
     }
 
     /**