Fix incorrect result for a server response of 204

[aai/rest-client.git] / src / main / java / org / openecomp / restclient / client / RestClient.java

diff --git a/src/main/java/org/openecomp/restclient/client/RestClient.java b/src/main/java/org/openecomp/restclient/client/RestClient.java
index 02d19e6..7dbc373 100644 (file)
--- a/src/main/java/org/openecomp/restclient/client/RestClient.java
+++ b/src/main/java/org/openecomp/restclient/client/RestClient.java
@@ -719,16 +719,16 @@ public class RestClient {
       opResult.setFailureCause("Client response was null");
       return;
     }
-
+        
     int statusCode = response.getStatus();
-    String payload = response.getEntity(String.class);
-
     opResult.setResultCode(statusCode);
 
     if (opResult.wasSuccessful()) {
-      opResult.setResult(payload);
+        if (statusCode != Response.Status.NO_CONTENT.getStatusCode()) {
+            opResult.setResult(response.getEntity(String.class));
+        }
     } else {
-      opResult.setFailureCause(payload);
+        opResult.setFailureCause(response.getEntity(String.class));
     }
 
     opResult.setHeaders(response.getHeaders());