Merge "Set WorkflowException on BPMN WF error"

2 files changed, 16 insertions, 1 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java
index d9c6857ef1..0c31dfa16f 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java
@@ -138,7 +138,9 @@ public class ExecuteActivity implements JavaDelegate {
 
             execution.setVariable(WORKFLOW_EXCEPTION, workflowException);
         } catch (Exception e) {
-            buildAndThrowException(execution, e.getMessage());
+            logger.error("BPMN exception on activity execution: " + e.getMessage());
+            workflowException = new WorkflowException(EXECUTE_BUILDING_BLOCK, 7000, e.getMessage());
+            handlingCode = ABORT_HANDLING_CODE;
         }
 
         if (workflowException != null && handlingCode != null && handlingCode.equals(ABORT_HANDLING_CODE)) {
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivityTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivityTest.java
index c0056291ef..1fde3f4fbc 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivityTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivityTest.java
@@ -92,6 +92,19 @@ public class ExecuteActivityTest extends BaseTaskTest {
     }
 
     @Test
+    public void executeException_Test() throws Exception {
+        execution.setVariable("workflowSyncAckSent", true);
+        execution.setVariable("testProcessKey", "testProcessKeyValue");
+        thrown.expect(BpmnError.class);
+        executeActivity.execute(execution);
+        String errorMessage = (String) execution.getVariable("ExecuteActivityErrorMessage");
+        assertEquals(errorMessage, "not implemented");
+        WorkflowException workflowException = (WorkflowException) execution.getVariable("WorkflowException");
+        assertEquals(workflowException.getErrorMessage(), "not implemented");
+        assertEquals(workflowException.getErrorCode(), 7000);
+    }
+
+    @Test
     public void buildAndThrowException_Test() throws Exception {
         doNothing().when(workflowActionBBFailure).updateRequestStatusToFailed(execution);
         doReturn("Process key").when(exceptionBuilder).getProcessKey(execution);