diff options
| author |   Marcus G K Williams <marcus.williams@intel.com> | 2019-06-10 14:32:22 -0700 |
|---|---|---|
| committer | Marcus G K Williams <marcus.williams@intel.com> | 2019-06-10 14:32:33 -0700 |
| commit | 1fb7d5b1d49390dc560805182f293764b38c5fec (patch) | |
| tree | d75ea468a8a2f13252f13192e4bcd5608177abf0 /bpmn/so-bpmn-tasks/src/main/java | |
| parent | d0cd4dc3d204e80a7419c97b6b0ec59273984a99 (diff) | |
Fix handling of NULL WorkflowAction northboundRequest
Issue-ID: SO-1995
Change-Id: I16fd6067d4fe31ce66b399e292a7e0706fe05c0c
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
Diffstat (limited to 'bpmn/so-bpmn-tasks/src/main/java')
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |