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
Improvement for closing connections
Michael Rademakerd0fab67f4c6b
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 16ea0505e..5aa842e25 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@@ -1155,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();}@@ -1180,14 +1181,14 @@ public class HttpClientProtocol extends AbstractProtocol {try {response = clientRequest.invoke(valueStr);+ responseConsumer.accept(response);} catch (Exception e) {LOG.log(Level.SEVERE, "Exception thrown whilst doing attribute write request", e);+ } finally {if (response != null) {response.close();}}-- responseConsumer.accept(response);}protected void onPollingResponse(HttpClientRequest request,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 215bfda1c..39a2db75d 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@@ -184,6 +184,7 @@ public class WebTargetBuilder {RequestConfig requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).setConnectionRequestTimeout(new Long(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue())+ .setConnectTimeout(new Long(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS).intValue()).setSocketTimeout(new Long(overrideSocketTimeout).intValue()).build();HttpClient apacheClient = HttpClientBuilder.create()