From 1fb7d5b1d49390dc560805182f293764b38c5fec Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Mon, 10 Jun 2019 14:32:22 -0700 Subject: Fix handling of NULL WorkflowAction northboundRequest Issue-ID: SO-1995 Change-Id: I16fd6067d4fe31ce66b399e292a7e0706fe05c0c Signed-off-by: Marcus G K Williams --- .../onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bpmn/so-bpmn-tasks/src/main/java/org/onap') diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 7065c2c76c..94209908be 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -117,6 +117,7 @@ public class WorkflowAction { private static final String FABRIC_CONFIGURATION = "FabricConfiguration"; private static final String G_SERVICE_TYPE = "serviceType"; private static final String SERVICE_TYPE_TRANSPORT = "TRANSPORT"; + private static final String CLOUD_OWNER = "DEFAULT"; private static final Logger logger = LoggerFactory.getLogger(WorkflowAction.class); @Autowired @@ -1324,8 +1325,8 @@ public class WorkflowAction { requestAction, resourceName.toString(), aLaCarte, cloudOwner); } if (northBoundRequest == null) { - northBoundRequest = catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScope(requestAction, - resourceName.toString(), aLaCarte); + northBoundRequest = catalogDbClient.getNorthBoundRequestByActionAndIsALaCarteAndRequestScopeAndCloudOwner( + requestAction, resourceName.toString(), aLaCarte, CLOUD_OWNER); } if (northBoundRequest == null) { if (aLaCarte) { -- cgit 1.2.3-korg