From: Boslet, Cory <cory.boslet@att.com>
Date: Sat, 3 Oct 2020 02:28:16 +0000 (-0400)
Subject: Only continue to wait on error when final
X-Git-Tag: 1.7.4~22^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F113503%2F1;p=so.git

Only continue to wait on error when final

Only continue to wait on error when final indicator is N

Issue-ID: SO-3285
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I2914762a6f2776dcb39ab68422b237ffc7eda0f0
---

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
index 669441c320..6377d77d19 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterRestV1.groovy
@@ -304,6 +304,10 @@ class SDNCAdapterRestV1 extends AbstractServiceTaskProcessor {
                 Boolean failOnCallbackError = execution.getVariable("failOnCallbackError")
                 if(failOnCallbackError) {
                     sdncAdapterBuildWorkflowException(execution, callback)
+                }else {
+                    if(ackFinalIndicator.equals('Y')) {
+                        sdncAdapterBuildWorkflowException(execution, callback)
+                    }
                 }
             }