Merge "Set workflowexceptionerrormessage in all cases"

1 files changed, 6 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 0a7a75c89b..122e71851f 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
@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -81,14 +81,13 @@ public class ExecuteBuildingBlockRainyDay {
             String serviceType = ASTERISK;
             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
+            if (workflowException != null) {
                 execution.setVariable("WorkflowExceptionErrorMessage", workflowException.getErrorMessage());
-            } catch (Exception e) {
-                logger.error("No WorkflowException Found", e);
+            } else {
+                logger.debug("WorkflowException is null, unable to set WorkflowExceptionErrorMessage");
             }
+            String handlingCode = "";
 
             if (suppressRollback) {
                 handlingCode = "Abort";