Michael Pasternak has uploaded a new change for review. Change subject: sdk: move to httpclient 4.2 ......................................................................
sdk: move to httpclient 4.2 Move to httpclient 4.2 which introduces improved ClientConnManager Change-Id: I9fbfd36c8d8a8940824197c8d4495531963dfdb3 Signed-off-by: Michael pasternak <[email protected]> --- M ovirt-engine-sdk-java/pom.xml M ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/web/ConnectionsPoolBuilder.java 2 files changed, 5 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/50/15350/1 diff --git a/ovirt-engine-sdk-java/pom.xml b/ovirt-engine-sdk-java/pom.xml index c0e3676..6fb21c6 100644 --- a/ovirt-engine-sdk-java/pom.xml +++ b/ovirt-engine-sdk-java/pom.xml @@ -37,7 +37,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.3</version> + <version>4.2</version> <scope>compile</scope> </dependency> <dependency> diff --git a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/web/ConnectionsPoolBuilder.java b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/web/ConnectionsPoolBuilder.java index 3b8a9de..dec227e 100644 --- a/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/web/ConnectionsPoolBuilder.java +++ b/ovirt-engine-sdk-java/src/main/java/org/ovirt/engine/sdk/web/ConnectionsPoolBuilder.java @@ -35,8 +35,7 @@ import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; -//import org.apache.http.impl.conn.PoolingClientConnectionManager; -import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; +import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.ovirt.engine.sdk.utils.StringUtils; /** @@ -231,22 +230,13 @@ private ClientConnectionManager createPoolingClientConnectionManager(String url, int port) { SchemeRegistry schemeRegistry = createSchemeRegistry(url, port); - // TODO: move to PoolingClientConnectionManager when upgrading to 4.2.x - // PoolingClientConnectionManager cm = - // new PoolingClientConnectionManager(schemeRegistry); - - ThreadSafeClientConnManager cm = - new ThreadSafeClientConnManager(schemeRegistry); - + PoolingClientConnectionManager cm = + new PoolingClientConnectionManager(schemeRegistry); cm.setMaxTotal(MAX_CONNECTIONS); cm.setDefaultMaxPerRoute(MAX_CONNECTIONS_PER_ROUTE); - cm.setMaxForRoute(new HttpRoute(new HttpHost(getHost(url), + cm.setMaxPerRoute(new HttpRoute(new HttpHost(getHost(url), getPort(url, port))), MAX_CONNECTIONS_PER_HOST); - - // cm.setMaxPerRoute(new HttpRoute(new HttpHost(getHost(url), - // getPort(url, port))), - // MAX_CONNECTIONS_PER_HOST); return cm; } -- To view, visit http://gerrit.ovirt.org/15350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fbfd36c8d8a8940824197c8d4495531963dfdb3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-sdk-java Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
