From 37b3bb9b015069ba5e9ad1845de30467decb61d4 Mon Sep 17 00:00:00 2001 From: Shiwei Tian Date: Mon, 9 Apr 2018 09:32:39 +0800 Subject: fix https bug Issue-ID: HOLMES-104 Change-Id: I6922584f94aa0ec79fda1e2b3dcc7da6c874c9da Signed-off-by: Shiwei Tian --- .../java/org/onap/holmes/rulemgt/msb/EngineIpList.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java') diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java index cfccd18..992785f 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java @@ -16,7 +16,10 @@ package org.onap.holmes.rulemgt.msb; +import java.io.IOException; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; +import org.apache.http.impl.client.CloseableHttpClient; import org.jvnet.hk2.annotations.Service; import org.onap.holmes.common.api.entity.ServiceEntity; import org.onap.holmes.common.api.entity.ServiceNode4Query; @@ -30,6 +33,7 @@ import java.util.HashMap; import java.util.List; @Service +@Slf4j public class EngineIpList { private String[] msbAddrInfo; @@ -47,12 +51,22 @@ public class EngineIpList { public List getServiceCount()throws Exception{ String response; + CloseableHttpClient httpClient = null; try { + httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT); HttpResponse httpResponse = HttpsUtils - .get(url, new HashMap<>()); + .get(url, new HashMap<>(), httpClient); response = HttpsUtils.extractResponseEntity(httpResponse); } catch (Exception e) { throw e; + } finally { + if (httpClient != null) { + try { + httpClient.close(); + } catch (IOException e) { + log.warn("Failed to close http client!"); + } + } } ServiceEntity service = GsonUtil.jsonToBean(response, ServiceEntity.class); List nodesList = service.getNodes(); -- cgit 1.2.3-korg