From: Seshu Kumar M <seshu.kumar.m@huawei.com>
Date: Tue, 24 Aug 2021 09:12:26 +0000 (+0000)
Subject: Merge "Fix NPE for GenericVnfHealthCheckBB" into honolulu
X-Git-Tag: 1.8.3~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=59c1ff984af365c75f9c406999be196ed76b0369;p=so.git

Merge "Fix NPE for GenericVnfHealthCheckBB" into honolulu
---

59c1ff984af365c75f9c406999be196ed76b0369
diff --cc bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ControllerExecutionBB.bpmn
index 94c32cc4a6,1935c5b619..065d7e0c4b
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ControllerExecutionBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ControllerExecutionBB.bpmn
@@@ -44,9 -44,9 +44,10 @@@
      <bpmn:sequenceFlow id="SequenceFlow_1lspfyy" sourceRef="ServiceTask_0inxg9l" targetRef="ExclusiveGateway_0plxwkg" />
      <bpmn:callActivity id="BBToExecute" name="BB to Execute&#10;" calledElement="${bbName}">
        <bpmn:extensionElements>
+         <camunda:in source="gBuildingBlockExecution" target="gBuildingBlockExecution" />
          <camunda:out source="WorkflowException" target="WorkflowException" />
          <camunda:out source="WorkflowExceptionErrorMessage" target="WorkflowExceptionErrorMessage" />
 +        <camunda:out source="ControllerStatus" target="ControllerStatus" />
          <camunda:in source="executionObject" target="executionObject" />
          <camunda:in source="mso-request-id" target="mso-request-id" />
          <camunda:in source="isRollback" target="isRollback" />