From: HuabingZhao <zhao.huabing@zte.com.cn>
Date: Mon, 12 Mar 2018 11:23:23 +0000 (+0800)
Subject: Solve 500 error for deleting service
X-Git-Tag: v1.1.0~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F35183%2F1;p=msb%2Fapigateway.git

Solve 500 error for deleting service

Change-Id: Iae4c56fe6cbe2009d36dfd451029413b9227c8f7
Issue-ID: MSB-99 MSB-92
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
---

diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/MicroServiceResource.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/MicroServiceResource.java
index 7ade6fa..5a582d6 100644
--- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/MicroServiceResource.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/MicroServiceResource.java
@@ -326,8 +326,13 @@ public class MicroServiceResource {
      * @throws IOException
      */
     private Response cloneHttpResponse(CloseableHttpResponse httpResponse) throws IOException {
-        String jsonString = EntityUtils.toString(httpResponse.getEntity());
-        Response response = Response.status(httpResponse.getStatusLine().getStatusCode()).entity(jsonString).build();
+        Response response;
+        if (httpResponse.getEntity() != null) {
+            String jsonString = EntityUtils.toString(httpResponse.getEntity());
+            response = Response.status(httpResponse.getStatusLine().getStatusCode()).entity(jsonString).build();
+        } else {
+            response = Response.status(httpResponse.getStatusLine().getStatusCode()).build();
+        }
         return response;
     }