From: Oleksandr Moliavko <o.moliavko@samsung.com>
Date: Mon, 1 Jul 2019 09:11:50 +0000 (+0300)
Subject: Added check for null response to prevent crash at
X-Git-Tag: 1.5.2~235
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cabd51660c3c8ec52e329027179f5c6cabb03aca;p=so.git

Added check for null response to prevent crash at
response.getEntity() method call.

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

diff --git a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
index 1893590106..3bd646fada 100644
--- a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
@@ -95,6 +95,11 @@ public class CloudifyClient {
      */
     public <T> T execute(CloudifyRequest<T> request) {
         CloudifyResponse response = request(request);
+
+        if (null == response) {
+            return null;
+        }
+
         return (request.returnType() != null && request.returnType() != Void.class)
                 ? response.getEntity(request.returnType())
                 : null;