Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4EC289BA for ; Fri, 12 Aug 2011 10:36:23 +0000 (UTC) Received: (qmail 44150 invoked by uid 500); 12 Aug 2011 10:36:21 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 43404 invoked by uid 500); 12 Aug 2011 10:36:12 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 43183 invoked by uid 99); 12 Aug 2011 10:35:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2011 10:35:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2011 10:35:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ABFD423888CC for ; Fri, 12 Aug 2011 10:35:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157038 [2/2] - in /httpcomponents/httpcore/trunk: httpcore-nio/src/examples/org/apache/http/examples/nio/ httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/ httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ httpcore-nio/... Date: Fri, 12 Aug 2011 10:35:33 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110812103534.ABFD423888CC@eris.apache.org> Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java?rev=1157038&r1=1157037&r2=1157038&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java Fri Aug 12 10:35:32 2011 @@ -50,7 +50,7 @@ public class HttpClientNio { public HttpClientNio(final HttpParams params) throws IOException { super(); - this.ioReactor = new DefaultConnectingIOReactor(2, params); + this.ioReactor = new DefaultConnectingIOReactor(); this.params = params; } Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java?rev=1157038&r1=1157037&r2=1157038&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLClient.java Fri Aug 12 10:35:32 2011 @@ -60,7 +60,7 @@ public class HttpSSLClient { super(); this.params = params; this.sslcontext = createSSLContext(); - this.ioReactor = new DefaultConnectingIOReactor(2, this.params); + this.ioReactor = new DefaultConnectingIOReactor(); } private TrustManagerFactory createTrustManagerFactory() throws NoSuchAlgorithmException { Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java?rev=1157038&r1=1157037&r2=1157038&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java Fri Aug 12 10:35:32 2011 @@ -65,7 +65,7 @@ public class HttpSSLServer { super(); this.params = params; this.sslcontext = createSSLContext(); - this.ioReactor = new DefaultListeningIOReactor(2, this.params); + this.ioReactor = new DefaultListeningIOReactor(); } private KeyManagerFactory createKeyManagerFactory() throws NoSuchAlgorithmException { Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java?rev=1157038&r1=1157037&r2=1157038&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpServerNio.java Fri Aug 12 10:35:32 2011 @@ -55,7 +55,7 @@ public class HttpServerNio { public HttpServerNio(final HttpParams params) throws IOException { super(); - this.ioReactor = new DefaultListeningIOReactor(2, params); + this.ioReactor = new DefaultListeningIOReactor(); this.params = params; } Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java?rev=1157038&r1=1157037&r2=1157038&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java Fri Aug 12 10:35:32 2011 @@ -78,11 +78,11 @@ public class BasicConnPool extends Abstr if (socket == null) { throw new IOException(scheme + " scheme is not supported"); } - int connTimeout = HttpConnectionParams.getConnectionTimeout(params); - int soTimeout = HttpConnectionParams.getSoTimeout(params); + int connectTimeout = HttpConnectionParams.getConnectionTimeout(this.params); + int soTimeout = HttpConnectionParams.getSoTimeout(this.params); socket.setSoTimeout(soTimeout); - socket.connect(new InetSocketAddress(host.getHostName(), host.getPort()), connTimeout); + socket.connect(new InetSocketAddress(host.getHostName(), host.getPort()), connectTimeout); conn.bind(socket, this.params); return conn; }