summaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-04-08 11:21:31 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-08 11:21:31 +0000
commite757e801c665a1758cf4c976b24df13adda38b2b (patch)
tree9bd6b9b3f72db830c5c235456644991aa0f85eb0 /adapters
parent70ff098fd488850655ad7ac98ad06712f0340552 (diff)
parent198dcad3901704a0b68a545e4cc7dbc4b5343413 (diff)
Merge "Fixed recent Sonar blocker issues"
Diffstat (limited to 'adapters')
-rw-r--r--adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
index 6d4deeb0f1..eb003cdda6 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
@@ -233,7 +233,8 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin{
StackInfo stackStatus = getStackStatus(cloudSiteId, cloudOwner, tenantId, canonicalName, pollForCompletion, timeoutMinutes, backout);
if (HeatStatus.CREATED.equals(stackStatus.getStatus())) {
- multicloudAaiUpdate(cloudSiteId, cloudOwner, tenantId, genericVnfId, vfModuleId, multicloudResponseBody.getWorkloadId(), pollForCompletion, timeoutMinutes);
+ String workloadId = multicloudResponseBody == null ? null : multicloudResponseBody.getWorkloadId();
+ multicloudAaiUpdate(cloudSiteId, cloudOwner, tenantId, genericVnfId, vfModuleId, workloadId, pollForCompletion, timeoutMinutes);
}
return stackStatus;
@@ -398,6 +399,7 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin{
if (multicloudClient == null) {
if (logger.isDebugEnabled())
logger.debug("Multicloud client could not be initialized");
+ return;
}
Response response = multicloudClient.post(multicloudRequest);