diff options
| author |   Steve Smokowski <ss835w@att.com> | 2019-03-04 17:32:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-04 17:32:22 +0000 |
| commit | 1da0c8d9ad2716d61c30d3333c679a4c1d85f341 (patch) | |
| tree | 651633f6cf1f006f9ad4116069cce12e0ffaad2a /bpmn/MSOCommonBPMN/src/main/java/org | |
| parent | 5a89cfc95defe9ff5eeeedd16086c26120da5625 (diff) | |
| parent | 89c1ed09024b96ad67d7c656b6dfd2d76cbcfbc0 (diff) | |
Merge "put error message in execution"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java/org')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java index 054198fd9a..aa992d6153 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/ExecuteBuildingBlockRainyDay.java @@ -83,6 +83,15 @@ public class ExecuteBuildingBlockRainyDay { boolean aLaCarte = (boolean) execution.getVariable("aLaCarte"); boolean suppressRollback = (boolean) execution.getVariable("suppressRollback"); String handlingCode = ""; + + WorkflowException workflowException = (WorkflowException) execution.getVariable("WorkflowException"); + try { + // Extract error data to be returned to WorkflowAction + execution.setVariable("WorkflowExceptionErrorMessage", workflowException.getErrorMessage()); + } catch (Exception e) { + logger.error("No WorkflowException Found",e); + } + if (suppressRollback) { handlingCode = "Abort"; } else { @@ -103,7 +112,7 @@ public class ExecuteBuildingBlockRainyDay { } catch (Exception ex) { // keep default vnfType value } - WorkflowException workflowException = (WorkflowException) execution.getVariable("WorkflowException"); + String errorCode = ASTERISK; try { errorCode = "" + workflowException.getErrorCode(); @@ -123,12 +132,6 @@ public class ExecuteBuildingBlockRainyDay { // keep default workStep value } - try { - // Extract error data to be returned to WorkflowAction - execution.setVariable("WorkflowExceptionErrorMessage", workflowException.getErrorMessage()); - } catch (Exception e) { - logger.error("No WorkflowException Found",e); - } RainyDayHandlerStatus rainyDayHandlerStatus; rainyDayHandlerStatus = catalogDbClient .getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAndWorkStep(bbName, |