diff options
| author |   Plummer, Brittany <brittany.plummer@att.com> | 2020-02-14 17:26:20 -0500 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2020-02-14 17:26:21 -0500 |
| commit | 4fec480b6a357b78f458227465458b98b367462f (patch) | |
| tree | 7ac28087ee3864ea01e332866e401e5a139b12ef /bpmn/so-bpmn-tasks/src/main/java/org/onap | |
| parent | 460b2c35e214b9422e9313a4bad8253669791ebf (diff) | |
Added logic to prevent exceptionbuilder from
Added logic to prevent double exception creation
Issue-ID: SO-2661
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ib575d5914a57b0417b7c6b830cdead8451438e12
Diffstat (limited to 'bpmn/so-bpmn-tasks/src/main/java/org/onap')
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 9 |
1 files changed, 7 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 80c6f0b969..2284c4af1a 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 @@ -431,7 +431,12 @@ public class WorkflowAction { execution.setVariable("isRollbackComplete", false); } catch (Exception ex) { - buildAndThrowException(execution, "Exception while setting execution list. ", ex); + if (!(execution.hasVariable("WorkflowException") + || execution.hasVariable("WorkflowExceptionExceptionMessage"))) { + buildAndThrowException(execution, "Exception while setting execution list. ", ex); + } else { + throw ex; + } } } @@ -537,7 +542,7 @@ public class WorkflowAction { if (configurations.size() > 1) { String multipleRelationshipsError = "Multiple relationships exist from VNFC " + vnfc.getVnfcName() + " to Configurations"; - buildAndThrowException(dataObj.getExecution(), multipleRelationshipsError, + buildAndThrowException(dataObj.getExecution(), "Exception in getConfigBuildingBlock: ", new Exception(multipleRelationshipsError)); } for (org.onap.aai.domain.yang.Configuration configuration : configurations) { |