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 09C37E430 for ; Fri, 28 Dec 2012 16:08:30 +0000 (UTC) Received: (qmail 73533 invoked by uid 500); 28 Dec 2012 16:08:29 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 73494 invoked by uid 500); 28 Dec 2012 16:08:29 -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 73486 invoked by uid 99); 28 Dec 2012 16:08:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Dec 2012 16:08:29 +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, 28 Dec 2012 16:08:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E460223888CD for ; Fri, 28 Dec 2012 16:08:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1426562 - in /httpcomponents/httpasyncclient/trunk: ./ httpasyncclient/src/examples/org/apache/http/examples/nio/client/ httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ httpasyncclient/src/main/java/org/apache/http/impl/nio/... Date: Fri, 28 Dec 2012 16:08:04 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121228160804.E460223888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Fri Dec 28 16:08:03 2012 New Revision: 1426562 URL: http://svn.apache.org/viewvc?rev=1426562&view=rev Log: tabs -> spaces; removed trailing whilespaces; updated stylecheck definitions Modified: httpcomponents/httpasyncclient/trunk/hc-checkstyle.xml httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/ZeroCopyHttpExchange.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncClientUtils.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java Modified: httpcomponents/httpasyncclient/trunk/hc-checkstyle.xml URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/hc-checkstyle.xml?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/hc-checkstyle.xml (original) +++ httpcomponents/httpasyncclient/trunk/hc-checkstyle.xml Fri Dec 28 16:08:03 2012 @@ -33,11 +33,11 @@ - + Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/ZeroCopyHttpExchange.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/ZeroCopyHttpExchange.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/ZeroCopyHttpExchange.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/examples/org/apache/http/examples/nio/client/ZeroCopyHttpExchange.java Fri Dec 28 16:08:03 2012 @@ -52,7 +52,7 @@ public class ZeroCopyHttpExchange { @Override protected File process( - final HttpResponse response, + final HttpResponse response, final File file, final ContentType contentType) throws Exception { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java Fri Dec 28 16:08:03 2012 @@ -684,7 +684,7 @@ class DefaultAsyncRequestDirector imp } return reg; } - + private HttpRequest createConnectRequest(final HttpRoute route) { // see RFC 2817, section 5.2 and // INTERNET-DRAFT: Tunneling TCP based protocols through Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java Fri Dec 28 16:08:03 2012 @@ -80,7 +80,7 @@ public class DefaultClientAsyncConnectio public String getId() { return this.id; } - + @Override protected void onResponseReceived(HttpResponse response) { if (response != null && this.headerlog.isDebugEnabled()) { Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java Fri Dec 28 16:08:03 2012 @@ -39,15 +39,15 @@ public class DefaultClientAsyncConnectio private final HttpResponseFactory responseFactory; private final ByteBufferAllocator allocator; - + public DefaultClientAsyncConnectionFactory() { super(); this.responseFactory = createHttpResponseFactory(); this.allocator = createByteBufferAllocator(); } - + public ClientAsyncConnection create( - final String id, + final String id, final IOSession iosession, final HttpParams params) { return new DefaultClientAsyncConnection( @@ -61,5 +61,5 @@ public class DefaultClientAsyncConnectio protected HttpResponseFactory createHttpResponseFactory() { return new DefaultHttpResponseFactory(); } - + } Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultHttpAsyncRoutePlanner.java Fri Dec 28 16:08:03 2012 @@ -58,7 +58,7 @@ public class DefaultHttpAsyncRoutePlanne } return reg; } - + public HttpRoute determineRoute( final HttpHost target, final HttpRequest request, Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java Fri Dec 28 16:08:03 2012 @@ -294,10 +294,10 @@ class ManagedClientAsyncConnectionImpl i } return reg; } - + public synchronized void open( final HttpRoute route, - final HttpContext context, + final HttpContext context, final HttpParams params) throws IOException { HttpPoolEntry entry = ensurePoolEntry(); RouteTracker tracker = entry.getTracker(); @@ -318,8 +318,8 @@ class ManagedClientAsyncConnectionImpl i } ClientAsyncConnection conn = this.connFactory.create( - "http-outgoing-" + entry.getId(), - iosession, + "http-outgoing-" + entry.getId(), + iosession, params); iosession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn); Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java Fri Dec 28 16:08:03 2012 @@ -99,7 +99,7 @@ public class PoolingClientAsyncConnectio protected ClientAsyncConnectionFactory createClientAsyncConnectionFactory() { return new DefaultClientAsyncConnectionFactory(); } - + public AsyncSchemeRegistry getSchemeRegistry() { return this.schemeRegistry; } Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java Fri Dec 28 16:08:03 2012 @@ -41,7 +41,7 @@ public class HttpAsyncClientUtils { * connection manager and releases the resources. *

* Example Code: - * + * * 

      * HttpAsyncClient httpAsyncClient = null;
      * try {
@@ -52,7 +52,7 @@ public class HttpAsyncClientUtils {
      *   HttpAsyncClientUtils.closeQuietly(httpAsyncClient);
      * }
      *
- * + * * @param httpAsyncClient * the HttpAsyncClient to close, may be null or already closed. */ Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java Fri Dec 28 16:08:03 2012 @@ -32,5 +32,5 @@ import org.apache.http.params.HttpParams public interface ClientAsyncConnectionFactory { ClientAsyncConnection create(String id, IOSession iosession, HttpParams params); - + } Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java Fri Dec 28 16:08:03 2012 @@ -137,7 +137,7 @@ public class TestClientAuthenticationFal HttpHost target = new HttpHost("localhost", address.getPort(), getSchemeName()); return target; } - + public class ResponseBasicUnauthorized implements HttpResponseInterceptor { public void process( Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java Fri Dec 28 16:08:03 2012 @@ -139,7 +139,7 @@ public class TestClientReauthentication HttpHost target = new HttpHost("localhost", address.getPort(), getSchemeName()); return target; } - + public class ResponseBasicUnauthorized implements HttpResponseInterceptor { public void process( Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncClientUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncClientUtils.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncClientUtils.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncClientUtils.java Fri Dec 28 16:08:03 2012 @@ -106,7 +106,7 @@ public class TestHttpAsyncClientUtils ex this.serverHttpProc, new DefaultConnectionReuseStrategy(), new DefaultHttpResponseFactory(), - requestHandlerResolver, expectationVerifier, + requestHandlerResolver, expectationVerifier, this.serverParams); this.server.start(serviceHandler); this.httpclient.start(); Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java?rev=1426562&r1=1426561&r2=1426562&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java Fri Dec 28 16:08:03 2012 @@ -735,7 +735,7 @@ public class TestRedirects extends HttpA Header header = reqWrapper.getFirstHeader(HTTP.USER_AGENT); Assert.assertEquals("my-test-client", header.getValue()); } - + static class CrossSiteRedirectService implements HttpRequestHandler { private final HttpHost host; @@ -752,7 +752,7 @@ public class TestRedirects extends HttpA ProtocolVersion ver = request.getRequestLine().getProtocolVersion(); String location; try { - URIBuilder uribuilder = new URIBuilder(request.getRequestLine().getUri()); + URIBuilder uribuilder = new URIBuilder(request.getRequestLine().getUri()); uribuilder.setScheme(this.host.getSchemeName()); uribuilder.setHost(this.host.getHostName()); uribuilder.setPort(this.host.getPort());