aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java5
1 files changed, 5 insertions, 0 deletions
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;