From: Oleksandr Moliavko <o.moliavko@samsung.com>
Date: Mon, 30 Sep 2019 11:05:49 +0000 (+0300)
Subject: Added null check for execute() result to remove
X-Git-Tag: 1.5.3~13^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bcba1e15d0e55eb90d0910dbbe3d30e9d88ed2bf;p=so.git

Added null check for execute() result to remove
static analyzer warning

Issue-ID: SO-1841
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Change-Id: Ifc8481b659c5b53378611f9e80db087db590ae05
---

diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/cloudify/utils/MsoCloudifyUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/cloudify/utils/MsoCloudifyUtils.java
index 2a17656f1d..4eb16d46b2 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/cloudify/utils/MsoCloudifyUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/cloudify/utils/MsoCloudifyUtils.java
@@ -419,7 +419,11 @@ public class MsoCloudifyUtils extends MsoCommonUtils implements VduPlugin {
                 logger.debug("pollTimeout remaining: " + pollTimeout);
 
                 execution = queryExecution.execute();
-                status = execution.getStatus();
+                if (execution != null) {
+                    status = execution.getStatus();
+                } else {
+                    status = TERMINATED;
+                }
             }
 
             // Broke the loop. Check again for a terminal state