Michael Pasternak has uploaded a new change for review. Change subject: sdk: move to httpclient 4.1.3 ......................................................................
sdk: move to httpclient 4.1.3 Change-Id: I6ee585baf06abb99d11377f25ce57f99398096f4 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, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java refs/changes/62/15262/1 diff --git a/ovirt-engine-sdk-java/pom.xml b/ovirt-engine-sdk-java/pom.xml index 2398d7d..c0e3676 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.2.2</version> + <version>4.1.3</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 dec227e..3b8a9de 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,7 +35,8 @@ 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.PoolingClientConnectionManager; +import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.ovirt.engine.sdk.utils.StringUtils; /** @@ -230,14 +231,23 @@ private ClientConnectionManager createPoolingClientConnectionManager(String url, int port) { SchemeRegistry schemeRegistry = createSchemeRegistry(url, port); - PoolingClientConnectionManager cm = - new PoolingClientConnectionManager(schemeRegistry); + // TODO: move to PoolingClientConnectionManager when upgrading to 4.2.x + // PoolingClientConnectionManager cm = + // new PoolingClientConnectionManager(schemeRegistry); + + ThreadSafeClientConnManager cm = + new ThreadSafeClientConnManager(schemeRegistry); + cm.setMaxTotal(MAX_CONNECTIONS); cm.setDefaultMaxPerRoute(MAX_CONNECTIONS_PER_ROUTE); - cm.setMaxPerRoute(new HttpRoute(new HttpHost(getHost(url), + cm.setMaxForRoute(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/15262 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ee585baf06abb99d11377f25ce57f99398096f4 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
