diff options
author | Gamboa, Gilbert <gilbert.g.gamboa@att.com> | 2019-10-24 14:33:12 -0400 |
---|---|---|
committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2019-11-04 14:02:58 -0500 |
commit | 0eac9a23fb2e79f3c996664cf6d6f02e1573dadc (patch) | |
tree | c38c3f67666c49e62ffe27e798b5d319ffbed353 /bpmn/mso-infrastructure-bpmn/src/main/java/org/onap | |
parent | 4ec5384dc1fac74d0fde85a4c941fe7aba233069 (diff) |
Call WorkflowActionTasks.sendErrorSyncAck()
Call WorkflowActionTasks.sendErrorSyncAck() instead of
WorkflowActionTasks.sendSyncAck() from WorkflowActionBB in error
handling subroutine.
Call WorkflowActionTasks.sendErrorSyncAck() instead of
WorkflowActionTasks.sendSyncAck() from WorkflowActionBB in error
handling subroutine.
Issue-ID: SO-2489
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I8c1c2bb6af70d5e76cfbfd3ce54fb506ab653cf7
Diffstat (limited to 'bpmn/mso-infrastructure-bpmn/src/main/java/org/onap')
-rw-r--r-- | bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowAsyncResource.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowAsyncResource.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowAsyncResource.java index ace6e1937d..4fb63651eb 100644 --- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowAsyncResource.java +++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/workflow/service/WorkflowAsyncResource.java @@ -102,7 +102,11 @@ public class WorkflowAsyncResource extends ProcessEngineAwareService { MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, getRequestId(inputVariables)); processor.startProcess(processKey, variableMap); WorkflowResponse response = waitForResponse(inputVariables); - return Response.status(202).entity(response).build(); + if (response.getMessageCode() == 500) { + return Response.status(500).entity(response).build(); + } else { + return Response.status(202).entity(response).build(); + } } catch (WorkflowProcessorException e) { WorkflowResponse response = e.getWorkflowResponse(); return Response.status(500).entity(response).build(); @@ -112,7 +116,7 @@ public class WorkflowAsyncResource extends ProcessEngineAwareService { } } - private WorkflowResponse waitForResponse(Map<String, Object> inputVariables) throws Exception { + protected WorkflowResponse waitForResponse(Map<String, Object> inputVariables) throws Exception { String requestId = getRequestId(inputVariables); long currentWaitTime = 0; long waitTime = getWaitTime(inputVariables); |