Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Ensure closing connection when catch clause is reached. Fix for expires cookies in responses

Michael Rademaker8e8d48a576e5
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.java
index 7e19f372a..fa67c8acc 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
@@ -1137,7 +1137,7 @@ public class HttpClientProtocol extends AbstractProtocol {
}
protected void executePollingRequest(HttpClientRequest clientRequest, String body, Consumer<Response> responseConsumer) {
- Response originalResponse, lastResponse;
+ Response originalResponse = null, lastResponse = null;
List<String> entities = new ArrayList<>();
try {
@@ -1154,6 +1154,12 @@ 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());
+ if (originalResponse != null) {
+ originalResponse.close();
+ }
+ if (lastResponse != null) {
+ lastResponse.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.java
index fc1435279..13e57581d 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
@@ -19,10 +19,15 @@
*/
package org.openremote.agent.protocol.http;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.jboss.resteasy.client.jaxrs.BasicAuthentication;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
+import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
import org.openremote.container.json.JacksonConfig;
import javax.ws.rs.Priorities;
@@ -175,7 +180,17 @@ public class WebTargetBuilder {
}
public static ResteasyClient createClient(ExecutorService executorService, int connectionPoolSize, long overrideSocketTimeout, UnaryOperator<ResteasyClientBuilder> builderConfigurator) {
+ //Create all of this config code in order to deal with expires cookies in responses
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setCookieSpec(CookieSpecs.STANDARD)
+ .build();
+ HttpClient apacheClient = HttpClientBuilder.create()
+ .setDefaultRequestConfig(requestConfig)
+ .build();
+ ApacheHttpClient43Engine engine = new ApacheHttpClient43Engine(apacheClient);
+
ResteasyClientBuilder clientBuilder = new ResteasyClientBuilder()
+ .httpEngine(engine)
.connectionPoolSize(connectionPoolSize)
.connectionCheckoutTimeout(CONNECTION_CHECKOUT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS)
.socketTimeout(overrideSocketTimeout, TimeUnit.MILLISECONDS)