From 556ec2e4d3fa31b96fe0d3f5a842254ad906af68 Mon Sep 17 00:00:00 2001 From: HuabingZhao Date: Mon, 12 Mar 2018 19:23:23 +0800 Subject: Solve 500 error for deleting service Change-Id: Iae4c56fe6cbe2009d36dfd451029413b9227c8f7 Issue-ID: MSB-99 MSB-92 Signed-off-by: HuabingZhao --- .../org/onap/msb/apiroute/resources/MicroServiceResource.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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; } -- cgit 1.2.3-korg