diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-24 17:13:45 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-24 17:13:45 +0100 |
commit | 3a27c6607c35a4479cce182296737b27e72b2a1f (patch) | |
tree | 4d7a42d245036cecaf4ba933298f8c991a16591b | |
parent | 8753bcca9e4f969e8e5f82f4cbb9a2d3bb42ef2e (diff) |
Don't close client
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java index 7981d0ecc97..4fbb001b880 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/StateRequestHandler.java @@ -117,13 +117,9 @@ public class StateRequestHandler extends RestApiRequestHandler<StateRequestHandl } protected ModelResponse getModelConfig(String tenant, String application, String environment, String region, String instance) { - try { - WebTarget target = client.target("http://localhost:" + restApiPort + "/"); - ConfigClient resource = WebResourceFactory.newResource(ConfigClient.class, target); - return resource.getServiceModel(tenant, application, environment, region, instance); - } finally { - client.close(); - } + WebTarget target = client.target("http://localhost:" + restApiPort + "/"); + ConfigClient resource = WebResourceFactory.newResource(ConfigClient.class, target); + return resource.getServiceModel(tenant, application, environment, region, instance); } protected HashMap<?, ?> singleService( @@ -131,14 +127,10 @@ public class StateRequestHandler extends RestApiRequestHandler<StateRequestHandl ServiceModel model = new ServiceModel(getModelConfig(tenantName, applicationName, environmentName, regionName, instanceName)); Service s = model.getService(identifier); int requestedPort = s.matchIdentifierWithPort(identifier); - try { - HealthClient resource = getHealthClient(apiParams, s, requestedPort, requestUri.getRawQuery(), client); - HashMap<?, ?> apiResult = resource.getHealthInfo(); - rewriteResourceLinks(requestUri, apiResult, model, s, applicationIdentifier(tenantName, applicationName, environmentName, regionName, instanceName), identifier); - return apiResult; - } finally { - client.close(); - } + HealthClient resource = getHealthClient(apiParams, s, requestedPort, requestUri.getRawQuery(), client); + HashMap<?, ?> apiResult = resource.getHealthInfo(); + rewriteResourceLinks(requestUri, apiResult, model, s, applicationIdentifier(tenantName, applicationName, environmentName, regionName, instanceName), identifier); + return apiResult; } protected HealthClient getHealthClient(String apiParams, Service s, int requestedPort, String uriQuery, Client client) { |