Merge "Added newToken null check to prevent crash at newToken.getValue() call"

diff --git a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.java
index 2478557..c4dcc89 100644 (file)
--- a/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.java
@@ -59,7 +59,9 @@ public class CloudifyClientTokenProvider implements CloudifyTokenProvider {
         tokenRequest.setBasicAuthentication(user, password);
         Token newToken = tokenRequest.execute();
 
-        token = newToken.getValue();
+        if (newToken != null) {
+            token = newToken.getValue();
+        }
 
         if (expiration == null) {
             expiration = new Date();