[MSO-8] Update the maven dependency

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / openecomp / mso / bpmn / common / scripts / VnfAdapterUtils.groovy

diff --git a/bpmn/MSOGammaBPMN/src/main/groovy/com/att/bpm/scripts/VnfAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterUtils.groovy
similarity index 71%
rename from bpmn/MSOGammaBPMN/src/main/groovy/com/att/bpm/scripts/VnfAdapterUtils.groovy
rename to bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterUtils.groovy
index e92af96..cd8d2a3 100644 (file)
--- a/bpmn/MSOGammaBPMN/src/main/groovy/com/att/bpm/scripts/VnfAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VnfAdapterUtils.groovy
@@ -7,9 +7,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.
@@ -17,11 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
-package com.att.bpm.scripts
+package org.openecomp.mso.bpmn.common.scripts
 
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.runtime.Execution;
+import org.openecomp.mso.bpmn.core.WorkflowException
 
 class VnfAdapterUtils {
 
@@ -50,11 +50,22 @@ class VnfAdapterUtils {
                        def responseCode = execution.getVariable(responseCodeVar)
                        def errorResponse = execution.getVariable(errorResponseVar)
 
+                       // The following if statement never appears to be true as any VNF Adapter error seems to be stored in 'errorResponse'.
+                       // Also, the value is stored as a WorkflowException object, not a String. Added the else if to provide the proper
+                       // functionality but leaving the original code in case it is hit under some circumstances.
                        if (response.contains("WorkflowException")) {
                                execution.setVariable(prefix + "ErrorResponse", response)
                                //execution.setVariable(prefix + "ResponseCode", responseCode)
                                taskProcessor.logDebug(" Sub Vnf flow Error WorkflowException Response - " + "\n" + response, isDebugLogEnabled)
                                throw new BpmnError("MSOWorkflowException")
+                       } else if (errorResponse != null && errorResponse instanceof WorkflowException) {
+                               // Not sure the variables with the associated prefix are still used
+                               execution.setVariable(prefix + "ErrorResponse", errorResponse.getErrorMessage())
+                               execution.setVariable(prefix + "ResponseCode", errorResponse.getErrorCode())
+                               taskProcessor.logDebug("Sub Vnf flow Error WorkflowException " + prefix + "ErrorResponse" + " - " +
+                                       errorResponse.getErrorMessage(), isDebugLogEnabled)
+                               // this is the important part to ensure we hit the Fallout Handler
+                               throw new BpmnError("MSOWorkflowException")
                        }
                } catch (BpmnError e) {
                        throw e;