100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Ensure JAX-RS Response object is closed to free connection and also set timeouts on underlying connection engine
Rich Turner491e3b670de9
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.javaindex 4d4ebf5b1..73afeb7f8 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java@@ -1147,6 +1147,7 @@ public class HttpClientProtocol extends AbstractProtocol {entities.add(lastResponse.readEntity(String.class));while ((lastResponse = executePagingRequest(clientRequest, lastResponse)) != null) {entities.add(lastResponse.readEntity(String.class));+ lastResponse.close();}originalResponse = PagingResponse.fromResponse(originalResponse).entity(entities).build();}@@ -1154,6 +1155,7 @@ public class HttpClientProtocol extends AbstractProtocol {responseConsumer.accept(originalResponse);} catch (Exception e) {LOG.log(Level.WARNING, getProtocolDisplayName() + " exception thrown whilst doing polling request [" + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage()) + "]: " + clientRequest.requestTarget.getUriBuilder().build().toString());+ } finally {if (originalResponse != null) {originalResponse.close();}diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java b/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.javaindex 13e57581d..215bfda1c 100644--- a/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java+++ b/agent/src/main/java/org/openremote/agent/protocol/http/WebTargetBuilder.java@@ -183,6 +183,8 @@ public class WebTargetBuilder {//Create all of this config code in order to deal with expires cookies in responsesRequestConfig requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD)+ .setConnectionRequestTimeout(new Long(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue())+ .setSocketTimeout(new Long(overrideSocketTimeout).intValue()).build();HttpClient apacheClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig)diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.javaindex 49e8d9164..b88652f7c 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java@@ -367,6 +367,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClienif (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) {LOG.warning("WebsocketHttpSubscription returned an un-successful response code: " + response.getStatus());}+ response.close();} else {websocketClient.sendMessage(subscription.body);}