hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r937477 [1/9] - in /httpcomponents/httpcore/trunk/httpcore-nio/src: main/java/org/apache/http/impl/nio/ main/java/org/apache/http/impl/nio/codecs/ main/java/org/apache/http/impl/nio/reactor/ main/java/org/apache/http/impl/nio/ssl/ main/java...
Date Fri, 23 Apr 2010 19:11:57 GMT
Author: olegk
Date: Fri Apr 23 19:11:53 2010
New Revision: 937477

URL: http://svn.apache.org/viewvc?rev=937477&view=rev
Log:
TABS -> SPACES

Modified:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ChannelEntry.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ExceptionEvent.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/InterestOpEntry.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/InterestOpsCallback.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointClosedCallback.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionClosedCallback.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestHandle.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoderChannel.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoderChannel.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/FileContentDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/FileContentEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/IOControl.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpMessageParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpMessageWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerConnection.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ByteArrayNIOEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/FileNIOEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpNIOEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/StringNIOEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorPNames.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpClientHandlerBase.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpServiceHandlerBase.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/package.html
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ConnectingIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/EventMask.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOReactorException.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOReactorExceptionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOReactorStatus.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOSession.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ListenerEndpoint.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/SessionBufferStatus.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/SessionInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/SessionOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/SessionRequest.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/SessionRequestCallback.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/DirectByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/HeapByteBufferAllocator.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/OoopsieRuntimeException.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/SimpleIOReactorExceptionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestChunkDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestChunkEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestHttpMessageParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/MockupDecoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/MockupEncoder.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/ReadableByteChannelMockup.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/SimpleEventListener.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/SimpleHttpRequestHandlerResolver.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestJob.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestRequestExecutionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java Fri Apr 23 19:11:53 2010
@@ -40,11 +40,11 @@ import org.apache.http.params.HttpParams
 import org.apache.http.protocol.ExecutionContext;
 
 /**
- * Default implementation of {@link IOEventDispatch} interface for plain 
+ * Default implementation of {@link IOEventDispatch} interface for plain
  * (unencrypted) client-side HTTP connections.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
@@ -61,14 +61,14 @@ public class DefaultClientIOEventDispatc
     protected final HttpParams params;
 
     /**
-     * Creates a new instance of this class to be used for dispatching I/O event 
+     * Creates a new instance of this class to be used for dispatching I/O event
      * notifications to the given protocol handler.
-     * 
+     *
      * @param handler the client protocol handler.
      * @param params HTTP parameters.
      */
     public DefaultClientIOEventDispatch(
-            final NHttpClientHandler handler, 
+            final NHttpClientHandler handler,
             final HttpParams params) {
         super();
         if (handler == null) {
@@ -81,52 +81,52 @@ public class DefaultClientIOEventDispatc
         this.handler = handler;
         this.params = params;
     }
-    
+
     /**
-     * Creates an instance of {@link HeapByteBufferAllocator} to be used 
+     * Creates an instance of {@link HeapByteBufferAllocator} to be used
      * by HTTP connections for allocating {@link java.nio.ByteBuffer} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link ByteBufferAllocator} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link ByteBufferAllocator} interface.
+     *
      * @return byte buffer allocator.
      */
     protected ByteBufferAllocator createByteBufferAllocator() {
-        return new HeapByteBufferAllocator(); 
+        return new HeapByteBufferAllocator();
     }
-        
+
     /**
-     * Creates an instance of {@link DefaultHttpResponseFactory} to be used 
+     * Creates an instance of {@link DefaultHttpResponseFactory} to be used
      * by HTTP connections for creating {@link HttpResponse} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link HttpResponseFactory} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link HttpResponseFactory} interface.
+     *
      * @return HTTP response factory.
      */
     protected HttpResponseFactory createHttpResponseFactory() {
         return new DefaultHttpResponseFactory();
     }
-    
+
     /**
      * Creates an instance of {@link DefaultNHttpClientConnection} based on the
      * given {@link IOSession}.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link NHttpClientIOTarget} interface. 
-     * 
-     * @param session the underlying I/O session. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link NHttpClientIOTarget} interface.
+     *
+     * @param session the underlying I/O session.
+     *
      * @return newly created HTTP connection.
      */
     protected NHttpClientIOTarget createConnection(final IOSession session) {
         return new DefaultNHttpClientConnection(
-                session, 
+                session,
                 createHttpResponseFactory(),
                 this.allocator,
-                this.params); 
+                this.params);
     }
-        
+
     public void connected(final IOSession session) {
         NHttpClientIOTarget conn = createConnection(session);
         Object attachment = session.getAttribute(IOSession.ATTACHMENT_KEY);
@@ -135,7 +135,7 @@ public class DefaultClientIOEventDispatc
     }
 
     public void disconnected(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         if (conn != null) {
             this.handler.closed(conn);
@@ -143,19 +143,19 @@ public class DefaultClientIOEventDispatc
     }
 
     public void inputReady(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         conn.consumeInput(this.handler);
     }
 
     public void outputReady(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         conn.produceOutput(this.handler);
     }
 
     public void timeout(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         this.handler.timeout(conn);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java Fri Apr 23 19:11:53 2010
@@ -52,26 +52,26 @@ import org.apache.http.params.HttpParams
 /**
  * Default implementation of the {@link NHttpClientConnection} interface.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#MAX_HEADER_COUNT}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#MAX_LINE_LENGTH}</li>
  * </ul>
- * 
+ *
  * @since 4.0
  */
-public class DefaultNHttpClientConnection 
+public class DefaultNHttpClientConnection
     extends NHttpConnectionBase implements NHttpClientIOTarget {
 
     protected final NHttpMessageParser<HttpResponse> responseParser;
     protected final NHttpMessageWriter<HttpRequest> requestWriter;
-    
+
     /**
      * Creates a new instance of this class given the underlying I/O session.
-     * 
+     *
      * @param session the underlying I/O session.
      * @param responseFactory HTTP response factory.
      * @param allocator byte buffer allocator.
@@ -92,14 +92,14 @@ public class DefaultNHttpClientConnectio
         this.hasBufferedOutput = false;
         this.session.setBufferStatus(this);
     }
-    
+
     /**
-     * Creates an instance of {@link NHttpMessageParser} to be used 
+     * Creates an instance of {@link NHttpMessageParser} to be used
      * by this connection for parsing incoming {@link HttpResponse} messages.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link NHttpMessageParser} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link NHttpMessageParser} interface.
+     *
      * @return HTTP response parser.
      */
     protected NHttpMessageParser<HttpResponse> createResponseParser(
@@ -111,12 +111,12 @@ public class DefaultNHttpClientConnectio
     }
 
     /**
-     * Creates an instance of {@link NHttpMessageWriter} to be used 
+     * Creates an instance of {@link NHttpMessageWriter} to be used
      * by this connection for writing out outgoing {@link HttpRequest} messages.
      * <p>
-     * This method can be overridden by a super class in order to provide 
-     * a different implementation of the {@link NHttpMessageWriter} interface. 
-     * 
+     * This method can be overridden by a super class in order to provide
+     * a different implementation of the {@link NHttpMessageWriter} interface.
+     *
      * @return HTTP response parser.
      */
     protected NHttpMessageWriter<HttpRequest> createRequestWriter(
@@ -125,19 +125,19 @@ public class DefaultNHttpClientConnectio
         // override in derived class to specify a line formatter
         return new DefaultHttpRequestWriter(buffer, null, params);
     }
-    
+
     public void resetInput() {
         this.response = null;
         this.contentDecoder = null;
         this.responseParser.reset();
     }
-    
+
     public void resetOutput() {
         this.request = null;
         this.contentEncoder = null;
         this.requestWriter.reset();
     }
-    
+
     public void consumeInput(final NHttpClientHandler handler) {
         if (this.status != ACTIVE) {
             this.session.clearEvent(EventMask.READ);
@@ -210,16 +210,16 @@ public class DefaultNHttpClientConnectio
                         }
                     }
                 }
-                
+
                 if (this.contentEncoder == null && !this.outbuf.hasData()) {
                     if (this.status == CLOSING) {
                         this.session.close();
                         this.status = CLOSED;
                         return;
                     }
-                    
+
                     this.session.clearEvent(EventMask.WRITE);
-                    
+
                     handler.requestReady(this);
                 }
             }
@@ -230,7 +230,7 @@ public class DefaultNHttpClientConnectio
             this.hasBufferedOutput = this.outbuf.hasData();
         }
     }
-    
+
     public void submitRequest(final HttpRequest request) throws IOException, HttpException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -267,5 +267,5 @@ public class DefaultNHttpClientConnectio
         buffer.append("]");
         return buffer.toString();
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java Fri Apr 23 19:11:53 2010
@@ -52,8 +52,8 @@ import org.apache.http.params.HttpParams
 /**
  * Default implementation of the {@link NHttpServerConnection} interface.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
@@ -63,15 +63,15 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.0
  */
-public class DefaultNHttpServerConnection 
+public class DefaultNHttpServerConnection
     extends NHttpConnectionBase implements NHttpServerIOTarget {
 
     protected final NHttpMessageParser<HttpRequest> requestParser;
     protected final NHttpMessageWriter<HttpResponse> responseWriter;
-    
+
     /**
      * Creates a new instance of this class given the underlying I/O session.
-     * 
+     *
      * @param session the underlying I/O session.
      * @param requestFactory HTTP request factory.
      * @param allocator byte buffer allocator.
@@ -91,12 +91,12 @@ public class DefaultNHttpServerConnectio
     }
 
     /**
-     * Creates an instance of {@link NHttpMessageParser} to be used 
+     * Creates an instance of {@link NHttpMessageParser} to be used
      * by this connection for parsing incoming {@link HttpRequest} messages.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link NHttpMessageParser} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link NHttpMessageParser} interface.
+     *
      * @return HTTP response parser.
      */
     protected NHttpMessageParser<HttpRequest> createRequestParser(
@@ -106,15 +106,15 @@ public class DefaultNHttpServerConnectio
         // override in derived class to specify a line parser
         return new DefaultHttpRequestParser(buffer, null, requestFactory, params);
     }
-    
+
     /**
-     * Creates an instance of {@link NHttpMessageWriter} to be used 
-     * by this connection for writing out outgoing {@link HttpResponse} 
+     * Creates an instance of {@link NHttpMessageWriter} to be used
+     * by this connection for writing out outgoing {@link HttpResponse}
      * messages.
      * <p>
-     * This method can be overridden by a super class in order to provide 
-     * a different implementation of the {@link NHttpMessageWriter} interface. 
-     * 
+     * This method can be overridden by a super class in order to provide
+     * a different implementation of the {@link NHttpMessageWriter} interface.
+     *
      * @return HTTP response parser.
      */
     protected NHttpMessageWriter<HttpResponse> createResponseWriter(
@@ -123,19 +123,19 @@ public class DefaultNHttpServerConnectio
         // override in derived class to specify a line formatter
         return new DefaultHttpResponseWriter(buffer, null, params);
     }
-    
+
     public void resetInput() {
         this.request = null;
         this.contentDecoder = null;
         this.requestParser.reset();
     }
-    
+
     public void resetOutput() {
         this.response = null;
         this.contentEncoder = null;
         this.responseWriter.reset();
     }
-    
+
     public void consumeInput(final NHttpServiceHandler handler) {
         if (this.status != ACTIVE) {
             this.session.clearEvent(EventMask.READ);
@@ -150,7 +150,7 @@ public class DefaultNHttpServerConnectio
                         this.inTransportMetrics.incrementBytesTransferred(bytesRead);
                     }
                     this.request = this.requestParser.parse();
-                } while (bytesRead > 0 && this.request == null);                
+                } while (bytesRead > 0 && this.request == null);
                 if (this.request != null) {
                     if (this.request instanceof HttpEntityEnclosingRequest) {
                         // Receive incoming entity
@@ -210,16 +210,16 @@ public class DefaultNHttpServerConnectio
                         }
                     }
                 }
-                
+
                 if (this.contentEncoder == null && !this.outbuf.hasData()) {
                     if (this.status == CLOSING) {
                         this.session.close();
                         this.status = CLOSED;
                         return;
                     }
-                    
+
                     this.session.clearEvent(EventMask.WRITE);
-               
+
                     handler.responseReady(this);
                 }
             }
@@ -230,7 +230,7 @@ public class DefaultNHttpServerConnectio
             this.hasBufferedOutput = this.outbuf.hasData();
         }
     }
-    
+
     public void submitResponse(final HttpResponse response) throws IOException, HttpException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP response may not be null");
@@ -269,5 +269,5 @@ public class DefaultNHttpServerConnectio
         buffer.append("]");
         return buffer.toString();
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java Fri Apr 23 19:11:53 2010
@@ -40,11 +40,11 @@ import org.apache.http.params.HttpParams
 import org.apache.http.protocol.ExecutionContext;
 
 /**
- * Default implementation of {@link IOEventDispatch} interface for plain 
+ * Default implementation of {@link IOEventDispatch} interface for plain
  * (unencrypted) server-side HTTP connections.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
@@ -59,11 +59,11 @@ public class DefaultServerIOEventDispatc
     protected final ByteBufferAllocator allocator;
     protected final NHttpServiceHandler handler;
     protected final HttpParams params;
-    
+
     /**
-     * Creates a new instance of this class to be used for dispatching I/O event 
+     * Creates a new instance of this class to be used for dispatching I/O event
      * notifications to the given protocol handler.
-     * 
+     *
      * @param handler the server protocol handler.
      * @param params HTTP parameters.
      */
@@ -81,52 +81,52 @@ public class DefaultServerIOEventDispatc
         this.handler = handler;
         this.params = params;
     }
-    
+
    /**
-    * Creates an instance of {@link HeapByteBufferAllocator} to be used 
+    * Creates an instance of {@link HeapByteBufferAllocator} to be used
     * by HTTP connections for allocating {@link java.nio.ByteBuffer} objects.
     * <p>
-    * This method can be overridden in a super class in order to provide 
-    * a different implementation of the {@link ByteBufferAllocator} interface. 
-    * 
+    * This method can be overridden in a super class in order to provide
+    * a different implementation of the {@link ByteBufferAllocator} interface.
+    *
     * @return byte buffer allocator.
     */
     protected ByteBufferAllocator createByteBufferAllocator() {
-        return new HeapByteBufferAllocator(); 
+        return new HeapByteBufferAllocator();
     }
-        
+
     /**
-     * Creates an instance of {@link DefaultHttpRequestFactory} to be used 
+     * Creates an instance of {@link DefaultHttpRequestFactory} to be used
      * by HTTP connections for creating {@link HttpRequest} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link HttpRequestFactory} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link HttpRequestFactory} interface.
+     *
      * @return HTTP request factory.
      */
     protected HttpRequestFactory createHttpRequestFactory() {
-        return new DefaultHttpRequestFactory(); 
+        return new DefaultHttpRequestFactory();
     }
-        
+
     /**
      * Creates an instance of {@link DefaultNHttpServerConnection} based on the
      * given {@link IOSession}.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link NHttpServerIOTarget} interface. 
-     * 
-     * @param session the underlying I/O session. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link NHttpServerIOTarget} interface.
+     *
+     * @param session the underlying I/O session.
+     *
      * @return newly created HTTP connection.
      */
     protected NHttpServerIOTarget createConnection(final IOSession session) {
         return new DefaultNHttpServerConnection(
-                session, 
+                session,
                 createHttpRequestFactory(),
                 this.allocator,
-                this.params); 
+                this.params);
     }
-        
+
     public void connected(final IOSession session) {
         NHttpServerIOTarget conn = createConnection(session);
         session.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
@@ -134,7 +134,7 @@ public class DefaultServerIOEventDispatc
     }
 
     public void disconnected(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         if (conn != null) {
             this.handler.closed(conn);
@@ -142,19 +142,19 @@ public class DefaultServerIOEventDispatc
     }
 
     public void inputReady(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         conn.consumeInput(this.handler);
     }
 
     public void outputReady(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         conn.produceOutput(this.handler);
     }
 
     public void timeout(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         this.handler.timeout(conn);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java Fri Apr 23 19:11:53 2010
@@ -73,11 +73,11 @@ import org.apache.http.protocol.HttpCont
 
 /**
  * This class serves as a base for all {@link NHttpConnection} implementations
- * and implements functionality common to both client and server 
+ * and implements functionality common to both client and server
  * HTTP connections.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
@@ -85,21 +85,21 @@ import org.apache.http.protocol.HttpCont
  *
  * @since 4.0
  */
-public class NHttpConnectionBase 
+public class NHttpConnectionBase
         implements NHttpConnection, HttpInetConnection, SessionBufferStatus {
 
     protected final HttpContext context;
-    
+
     protected final ContentLengthStrategy incomingContentStrategy;
     protected final ContentLengthStrategy outgoingContentStrategy;
-    
+
     protected final SessionInputBufferImpl inbuf;
     protected final SessionOutputBufferImpl outbuf;
-    
+
     protected final HttpTransportMetricsImpl inTransportMetrics;
     protected final HttpTransportMetricsImpl outTransportMetrics;
     protected final HttpConnectionMetricsImpl connMetrics;
-    
+
     protected IOSession session;
     protected volatile ContentDecoder contentDecoder;
     protected volatile boolean hasBufferedInput;
@@ -109,10 +109,10 @@ public class NHttpConnectionBase 
     protected volatile HttpResponse response;
 
     protected volatile int status;
-    
+
     /**
      * Creates a new instance of this class given the underlying I/O session.
-     * 
+     *
      * @param session the underlying I/O session.
      * @param allocator byte buffer allocator.
      * @param params HTTP parameters.
@@ -130,25 +130,25 @@ public class NHttpConnectionBase 
         }
         this.session = session;
         this.context = new SessionHttpContext(session);
-        
+
         int buffersize = HttpConnectionParams.getSocketBufferSize(params);
         int linebuffersize = buffersize;
         if (linebuffersize > 512) {
             linebuffersize = 512;
         }
-        
-        this.inbuf = new SessionInputBufferImpl(buffersize, linebuffersize, allocator, params); 
-        this.outbuf = new SessionOutputBufferImpl(buffersize, linebuffersize, allocator, params); 
-        
+
+        this.inbuf = new SessionInputBufferImpl(buffersize, linebuffersize, allocator, params);
+        this.outbuf = new SessionOutputBufferImpl(buffersize, linebuffersize, allocator, params);
+
         this.incomingContentStrategy = new LaxContentLengthStrategy();
         this.outgoingContentStrategy = new StrictContentLengthStrategy();
-        
+
         this.inTransportMetrics = new HttpTransportMetricsImpl();
         this.outTransportMetrics = new HttpTransportMetricsImpl();
         this.connMetrics = new HttpConnectionMetricsImpl(
-                this.inTransportMetrics, 
+                this.inTransportMetrics,
                 this.outTransportMetrics);
-        
+
         this.session.setBufferStatus(this);
         this.session.setEvent(EventMask.READ);
         this.status = ACTIVE;
@@ -190,7 +190,7 @@ public class NHttpConnectionBase 
      * Initializes a specific {@link ContentDecoder} implementation based on the
      * properties of the given {@link HttpMessage} and generates an instance of
      * {@link HttpEntity} matching the properties of the content decoder.
-     * 
+     *
      * @param message the HTTP message.
      * @return HTTP entity.
      * @throws HttpException in case of an HTTP protocol violation.
@@ -200,8 +200,8 @@ public class NHttpConnectionBase 
         long len = this.incomingContentStrategy.determineLength(message);
         this.contentDecoder = createContentDecoder(
                 len,
-                this.session.channel(), 
-                this.inbuf, 
+                this.session.channel(),
+                this.inbuf,
                 this.inTransportMetrics);
         if (len == ContentLengthStrategy.CHUNKED) {
             entity.setChunked(true);
@@ -213,34 +213,34 @@ public class NHttpConnectionBase 
             entity.setChunked(false);
             entity.setContentLength(len);
         }
-        
+
         Header contentTypeHeader = message.getFirstHeader(HTTP.CONTENT_TYPE);
         if (contentTypeHeader != null) {
-            entity.setContentType(contentTypeHeader);    
+            entity.setContentType(contentTypeHeader);
         }
         Header contentEncodingHeader = message.getFirstHeader(HTTP.CONTENT_ENCODING);
         if (contentEncodingHeader != null) {
-            entity.setContentEncoding(contentEncodingHeader);    
+            entity.setContentEncoding(contentEncodingHeader);
         }
         return entity;
     }
-    
+
     /**
      * Factory method for {@link ContentDecoder} instances.
-     * 
+     *
      * @param len content length, if known, {@link ContentLengthStrategy#CHUNKED} or
-     *   {@link ContentLengthStrategy#IDENTITY}, if unknown. 
+     *   {@link ContentLengthStrategy#IDENTITY}, if unknown.
      * @param channel the session channel.
      * @param buffer the session buffer.
      * @param metrics transport metrics.
-     * 
+     *
      * @return content decoder.
-     * 
+     *
      * @since 4.1
      */
     protected ContentDecoder createContentDecoder(
-            final long len,            
-            final ReadableByteChannel channel, 
+            final long len,
+            final ReadableByteChannel channel,
             final SessionInputBuffer buffer,
             final HttpTransportMetricsImpl metrics) {
         if (len == ContentLengthStrategy.CHUNKED) {
@@ -255,7 +255,7 @@ public class NHttpConnectionBase 
     /**
      * Initializes a specific {@link ContentEncoder} implementation based on the
      * properties of the given {@link HttpMessage}.
-     * 
+     *
      * @param message the HTTP message.
      * @throws HttpException in case of an HTTP protocol violation.
      */
@@ -267,23 +267,23 @@ public class NHttpConnectionBase 
                 this.outbuf,
                 this.outTransportMetrics);
     }
-    
+
     /**
      * Factory method for {@link ContentEncoder} instances.
-     * 
+     *
      * @param len content length, if known, {@link ContentLengthStrategy#CHUNKED} or
-     *   {@link ContentLengthStrategy#IDENTITY}, if unknown. 
+     *   {@link ContentLengthStrategy#IDENTITY}, if unknown.
      * @param channel the session channel.
      * @param buffer the session buffer.
      * @param metrics transport metrics.
-     * 
+     *
      * @return content encoder.
-     * 
+     *
      * @since 4.1
      */
     protected ContentEncoder createContentEncoder(
             final long len,
-            final WritableByteChannel channel, 
+            final WritableByteChannel channel,
             final SessionOutputBuffer buffer,
             final HttpTransportMetricsImpl metrics) {
         if (len == ContentLengthStrategy.CHUNKED) {
@@ -302,11 +302,11 @@ public class NHttpConnectionBase 
     public boolean hasBufferedOutput() {
         return this.hasBufferedOutput;
     }
-    
+
     /**
      * Assets if the connection is still open.
-     * 
-     * @throws ConnectionClosedException in case the connection has already 
+     *
+     * @throws ConnectionClosedException in case the connection has already
      *   been closed.
      */
     protected void assertNotClosed() throws ConnectionClosedException {
@@ -335,7 +335,7 @@ public class NHttpConnectionBase 
     public boolean isStale() {
         return this.session.isClosed();
     }
-    
+
     public InetAddress getLocalAddress() {
         SocketAddress address = this.session.getLocalAddress();
         if (address instanceof InetSocketAddress) {
@@ -388,5 +388,5 @@ public class NHttpConnectionBase 
     public HttpConnectionMetrics getMetrics() {
         return this.connMetrics;
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java Fri Apr 23 19:11:53 2010
@@ -51,8 +51,8 @@ import org.apache.http.protocol.Executio
  * Default implementation of {@link IOEventDispatch} interface for SSL
  * (encrypted) client-side HTTP connections.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
@@ -61,25 +61,25 @@ import org.apache.http.protocol.Executio
  * </ul>
  *
  * @since 4.0
- * 
+ *
  * @deprecated use {@link org.apache.http.impl.nio.ssl.SSLClientIOEventDispatch}
  */
 @Deprecated
 public class SSLClientIOEventDispatch implements IOEventDispatch {
 
     private static final String SSL_SESSION = "SSL_SESSION";
-    
+
     protected final NHttpClientHandler handler;
     protected final SSLContext sslcontext;
     protected final SSLIOSessionHandler sslHandler;
     protected final HttpParams params;
-    
+
     /**
-     * Creates a new instance of this class to be used for dispatching I/O event 
-     * notifications to the given protocol handler using the given 
-     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL 
+     * Creates a new instance of this class to be used for dispatching I/O event
+     * notifications to the given protocol handler using the given
+     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL
      * protocol aspects for HTTP connections.
-     * 
+     *
      * @param handler the client protocol handler.
      * @param sslcontext the SSL context.
      * @param sslHandler the SSL handler.
@@ -105,13 +105,13 @@ public class SSLClientIOEventDispatch im
         this.sslcontext = sslcontext;
         this.sslHandler = sslHandler;
     }
-    
+
     /**
-     * Creates a new instance of this class to be used for dispatching I/O event 
-     * notifications to the given protocol handler using the given 
-     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL 
+     * Creates a new instance of this class to be used for dispatching I/O event
+     * notifications to the given protocol handler using the given
+     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL
      * protocol aspects for HTTP connections.
-     * 
+     *
      * @param handler the client protocol handler.
      * @param sslcontext the SSL context.
      * @param params HTTP parameters.
@@ -122,60 +122,60 @@ public class SSLClientIOEventDispatch im
             final HttpParams params) {
         this(handler, sslcontext, null, params);
     }
-    
+
     /**
-     * Creates an instance of {@link HeapByteBufferAllocator} to be used 
+     * Creates an instance of {@link HeapByteBufferAllocator} to be used
      * by HTTP connections for allocating {@link java.nio.ByteBuffer} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link ByteBufferAllocator} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link ByteBufferAllocator} interface.
+     *
      * @return byte buffer allocator.
      */
     protected ByteBufferAllocator createByteBufferAllocator() {
-        return new HeapByteBufferAllocator(); 
+        return new HeapByteBufferAllocator();
     }
-        
+
     /**
-     * Creates an instance of {@link DefaultHttpResponseFactory} to be used 
+     * Creates an instance of {@link DefaultHttpResponseFactory} to be used
      * by HTTP connections for creating {@link HttpResponse} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link HttpResponseFactory} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link HttpResponseFactory} interface.
+     *
      * @return HTTP response factory.
      */
     protected HttpResponseFactory createHttpResponseFactory() {
         return new DefaultHttpResponseFactory();
     }
-    
+
     /**
      * Creates an instance of {@link DefaultNHttpClientConnection} based on the
      * given SSL {@link IOSession}.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link NHttpClientIOTarget} interface. 
-     * 
-     * @param session the underlying SSL I/O session. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link NHttpClientIOTarget} interface.
+     *
+     * @param session the underlying SSL I/O session.
+     *
      * @return newly created HTTP connection.
      */
     protected NHttpClientIOTarget createConnection(final IOSession session) {
         return new DefaultNHttpClientConnection(
-                session, 
+                session,
                 createHttpResponseFactory(),
                 createByteBufferAllocator(),
-                this.params); 
+                this.params);
     }
-        
+
     /**
      * Creates an instance of {@link SSLIOSession} decorating the given
      * {@link IOSession}.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of SSL I/O session. 
-     * 
-     * @param session the underlying I/O session. 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of SSL I/O session.
+     *
+     * @param session the underlying I/O session.
      * @param sslcontext the SSL context.
      * @param sslHandler the SSL handler.
      * @return newly created SSL I/O session.
@@ -184,22 +184,22 @@ public class SSLClientIOEventDispatch im
             final IOSession session,
             final SSLContext sslcontext,
             final SSLIOSessionHandler sslHandler) {
-        return new SSLIOSession(session, sslcontext, sslHandler); 
+        return new SSLIOSession(session, sslcontext, sslHandler);
     }
-    
+
     public void connected(final IOSession session) {
 
         SSLIOSession sslSession = createSSLIOSession(
-                session, 
+                session,
                 this.sslcontext,
-                this.sslHandler); 
-        
+                this.sslHandler);
+
         NHttpClientIOTarget conn = createConnection(
                 sslSession);
-        
+
         session.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
         session.setAttribute(SSL_SESSION, sslSession);
-        
+
         Object attachment = session.getAttribute(IOSession.ATTACHMENT_KEY);
         this.handler.connected(conn, attachment);
 
@@ -212,7 +212,7 @@ public class SSLClientIOEventDispatch im
     }
 
     public void disconnected(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
         if (conn != null) {
             this.handler.closed(conn);
@@ -220,9 +220,9 @@ public class SSLClientIOEventDispatch im
     }
 
     public void inputReady(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
-        SSLIOSession sslSession = 
+        SSLIOSession sslSession =
             (SSLIOSession) session.getAttribute(SSL_SESSION);
 
         try {
@@ -237,9 +237,9 @@ public class SSLClientIOEventDispatch im
     }
 
     public void outputReady(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
-        SSLIOSession sslSession = 
+        SSLIOSession sslSession =
             (SSLIOSession) session.getAttribute(SSL_SESSION);
 
         try {
@@ -254,15 +254,15 @@ public class SSLClientIOEventDispatch im
     }
 
     public void timeout(final IOSession session) {
-        NHttpClientIOTarget conn = 
+        NHttpClientIOTarget conn =
             (NHttpClientIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
-        SSLIOSession sslSession = 
+        SSLIOSession sslSession =
             (SSLIOSession) session.getAttribute(SSL_SESSION);
 
         this.handler.timeout(conn);
         synchronized (sslSession) {
             if (sslSession.isOutboundDone() && !sslSession.isInboundDone()) {
-                // The session failed to terminate cleanly 
+                // The session failed to terminate cleanly
                 sslSession.shutdown();
             }
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java Fri Apr 23 19:11:53 2010
@@ -51,8 +51,8 @@ import org.apache.http.protocol.Executio
  * Default implementation of {@link IOEventDispatch} interface for SSL
  * (encrypted) server-side HTTP connections.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#SOCKET_BUFFER_SIZE}</li>
@@ -61,25 +61,25 @@ import org.apache.http.protocol.Executio
  * </ul>
  *
  * @since 4.0
- * 
+ *
  * @deprecated use {@link org.apache.http.impl.nio.ssl.SSLServerIOEventDispatch}
  */
 @Deprecated
 public class SSLServerIOEventDispatch implements IOEventDispatch {
 
     private static final String SSL_SESSION = "SSL_SESSION";
-   
+
     protected final NHttpServiceHandler handler;
     protected final SSLContext sslcontext;
     protected final SSLIOSessionHandler sslHandler;
     protected final HttpParams params;
-    
+
     /**
-     * Creates a new instance of this class to be used for dispatching I/O event 
-     * notifications to the given protocol handler using the given 
-     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL 
+     * Creates a new instance of this class to be used for dispatching I/O event
+     * notifications to the given protocol handler using the given
+     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL
      * protocol aspects for HTTP connections.
-     * 
+     *
      * @param handler the server protocol handler.
      * @param sslcontext the SSL context.
      * @param sslHandler the SSL handler.
@@ -105,13 +105,13 @@ public class SSLServerIOEventDispatch im
         this.sslcontext = sslcontext;
         this.sslHandler = sslHandler;
     }
-    
+
     /**
-     * Creates a new instance of this class to be used for dispatching I/O event 
-     * notifications to the given protocol handler using the given 
-     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL 
+     * Creates a new instance of this class to be used for dispatching I/O event
+     * notifications to the given protocol handler using the given
+     * {@link SSLContext}. This I/O dispatcher will transparently handle SSL
      * protocol aspects for HTTP connections.
-     * 
+     *
      * @param handler the server protocol handler.
      * @param sslcontext the SSL context.
      * @param params HTTP parameters.
@@ -122,60 +122,60 @@ public class SSLServerIOEventDispatch im
             final HttpParams params) {
         this(handler, sslcontext, null, params);
     }
-    
+
     /**
-     * Creates an instance of {@link HeapByteBufferAllocator} to be used 
+     * Creates an instance of {@link HeapByteBufferAllocator} to be used
      * by HTTP connections for allocating {@link java.nio.ByteBuffer} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link ByteBufferAllocator} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link ByteBufferAllocator} interface.
+     *
      * @return byte buffer allocator.
      */
     protected ByteBufferAllocator createByteBufferAllocator() {
-        return new HeapByteBufferAllocator(); 
+        return new HeapByteBufferAllocator();
     }
-        
+
     /**
-     * Creates an instance of {@link DefaultHttpRequestFactory} to be used 
+     * Creates an instance of {@link DefaultHttpRequestFactory} to be used
      * by HTTP connections for creating {@link HttpRequest} objects.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link HttpRequestFactory} interface. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link HttpRequestFactory} interface.
+     *
      * @return HTTP request factory.
      */
     protected HttpRequestFactory createHttpRequestFactory() {
-        return new DefaultHttpRequestFactory(); 
+        return new DefaultHttpRequestFactory();
     }
-        
+
     /**
      * Creates an instance of {@link DefaultNHttpServerConnection} based on the
      * given {@link IOSession}.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of the {@link NHttpServerIOTarget} interface. 
-     * 
-     * @param session the underlying SSL I/O session. 
-     * 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of the {@link NHttpServerIOTarget} interface.
+     *
+     * @param session the underlying SSL I/O session.
+     *
      * @return newly created HTTP connection.
      */
     protected NHttpServerIOTarget createConnection(final IOSession session) {
         return new DefaultNHttpServerConnection(
-                session, 
+                session,
                 createHttpRequestFactory(),
                 createByteBufferAllocator(),
-                this.params); 
+                this.params);
     }
-        
+
     /**
      * Creates an instance of {@link SSLIOSession} decorating the given
      * {@link IOSession}.
      * <p>
-     * This method can be overridden in a super class in order to provide 
-     * a different implementation of SSL I/O session. 
-     * 
-     * @param session the underlying I/O session. 
+     * This method can be overridden in a super class in order to provide
+     * a different implementation of SSL I/O session.
+     *
+     * @param session the underlying I/O session.
      * @param sslcontext the SSL context.
      * @param sslHandler the SSL handler.
      * @return newly created SSL I/O session.
@@ -184,19 +184,19 @@ public class SSLServerIOEventDispatch im
             final IOSession session,
             final SSLContext sslcontext,
             final SSLIOSessionHandler sslHandler) {
-        return new SSLIOSession(session, sslcontext, sslHandler); 
+        return new SSLIOSession(session, sslcontext, sslHandler);
     }
-    
+
     public void connected(final IOSession session) {
 
         SSLIOSession sslSession = createSSLIOSession(
-                session, 
+                session,
                 this.sslcontext,
-                this.sslHandler); 
-        
+                this.sslHandler);
+
         NHttpServerIOTarget conn = createConnection(
-                sslSession); 
-        
+                sslSession);
+
         session.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
         session.setAttribute(SSL_SESSION, sslSession);
 
@@ -211,7 +211,7 @@ public class SSLServerIOEventDispatch im
     }
 
     public void disconnected(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
 
         if (conn != null) {
@@ -220,9 +220,9 @@ public class SSLServerIOEventDispatch im
     }
 
     public void inputReady(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
-        SSLIOSession sslSession = 
+        SSLIOSession sslSession =
             (SSLIOSession) session.getAttribute(SSL_SESSION);
 
         try {
@@ -237,9 +237,9 @@ public class SSLServerIOEventDispatch im
     }
 
     public void outputReady(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
-        SSLIOSession sslSession = 
+        SSLIOSession sslSession =
             (SSLIOSession) session.getAttribute(SSL_SESSION);
 
         try {
@@ -254,9 +254,9 @@ public class SSLServerIOEventDispatch im
     }
 
     public void timeout(final IOSession session) {
-        NHttpServerIOTarget conn = 
+        NHttpServerIOTarget conn =
             (NHttpServerIOTarget) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
-        SSLIOSession sslSession = 
+        SSLIOSession sslSession =
             (SSLIOSession) session.getAttribute(SSL_SESSION);
 
         this.handler.timeout(conn);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java Fri Apr 23 19:11:53 2010
@@ -33,12 +33,12 @@ import org.apache.http.protocol.HttpCont
 class SessionHttpContext implements HttpContext {
 
     private final IOSession iosession;
-    
+
     public SessionHttpContext(final IOSession iosession) {
         super();
         this.iosession = iosession;
     }
-    
+
     public Object getAttribute(final String id) {
         return this.iosession.getAttribute(id);
     }
@@ -50,5 +50,5 @@ class SessionHttpContext implements Http
     public void setAttribute(final String id, final Object obj) {
         this.iosession.setAttribute(id, obj);
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java Fri Apr 23 19:11:53 2010
@@ -34,29 +34,29 @@ import org.apache.http.nio.reactor.Sessi
 import org.apache.http.impl.io.HttpTransportMetricsImpl;
 
 /**
- * Abstract {@link ContentDecoder} that serves as a base for all content 
+ * Abstract {@link ContentDecoder} that serves as a base for all content
  * decoder implementations.
  *
  * @since 4.0
  */
 public abstract class AbstractContentDecoder implements ContentDecoder {
-    
+
     protected final ReadableByteChannel channel;
     protected final SessionInputBuffer buffer;
     protected final HttpTransportMetricsImpl metrics;
-    
+
     protected boolean completed;
-    
+
     /**
      * Creates an instance of this class.
-     * 
+     *
      * @param channel the source channel.
      * @param buffer the session input buffer that can be used to store
      *    session data for intermediate processing.
      * @param metrics Transport metrics of the underlying HTTP transport.
      */
     public AbstractContentDecoder(
-            final ReadableByteChannel channel, 
+            final ReadableByteChannel channel,
             final SessionInputBuffer buffer,
             final HttpTransportMetricsImpl metrics) {
         super();
@@ -65,10 +65,10 @@ public abstract class AbstractContentDec
         }
         if (buffer == null) {
             throw new IllegalArgumentException("Session input buffer may not be null");
-        }        
+        }
         if (metrics == null) {
             throw new IllegalArgumentException("Transport metrics may not be null");
-        }        
+        }
         this.buffer = buffer;
         this.channel = channel;
         this.metrics = metrics;
@@ -77,5 +77,5 @@ public abstract class AbstractContentDec
     public boolean isCompleted() {
         return this.completed;
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java Fri Apr 23 19:11:53 2010
@@ -35,7 +35,7 @@ import org.apache.http.nio.ContentEncode
 import org.apache.http.nio.reactor.SessionOutputBuffer;
 
 /**
- * Abstract {@link ContentEncoder} that serves as a base for all content 
+ * Abstract {@link ContentEncoder} that serves as a base for all content
  * encoder implementations.
  *
  * @since 4.0
@@ -45,19 +45,19 @@ public abstract class AbstractContentEnc
     protected final WritableByteChannel channel;
     protected final SessionOutputBuffer buffer;
     protected final HttpTransportMetricsImpl metrics;
-    
+
     protected boolean completed;
-    
+
     /**
      * Creates an instance of this class.
-     * 
+     *
      * @param channel the destination channel.
      * @param buffer the session output buffer that can be used to store
      *    session data for intermediate processing.
      * @param metrics Transport metrics of the underlying HTTP transport.
      */
     public AbstractContentEncoder(
-            final WritableByteChannel channel, 
+            final WritableByteChannel channel,
             final SessionOutputBuffer buffer,
             final HttpTransportMetricsImpl metrics) {
         super();
@@ -66,10 +66,10 @@ public abstract class AbstractContentEnc
         }
         if (buffer == null) {
             throw new IllegalArgumentException("Session input buffer may not be null");
-        }        
+        }
         if (metrics == null) {
             throw new IllegalArgumentException("Transport metrics may not be null");
-        }        
+        }
         this.buffer = buffer;
         this.channel = channel;
         this.metrics = metrics;
@@ -78,15 +78,15 @@ public abstract class AbstractContentEnc
     public boolean isCompleted() {
         return this.completed;
     }
-    
+
     public void complete() throws IOException {
         this.completed = true;
     }
-    
+
     protected void assertNotCompleted() {
         if (this.completed) {
             throw new IllegalStateException("Decoding process already completed");
         }
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java Fri Apr 23 19:11:53 2010
@@ -45,11 +45,11 @@ import org.apache.http.params.HttpParams
 import org.apache.http.util.CharArrayBuffer;
 
 /**
- * Abstract {@link NHttpMessageParser} that serves as a base for all message 
+ * Abstract {@link NHttpMessageParser} that serves as a base for all message
  * parser implementations.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#MAX_HEADER_COUNT}</li>
  *  <li>{@link org.apache.http.params.CoreConnectionPNames#MAX_LINE_LENGTH}</li>
@@ -58,13 +58,13 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 public abstract class AbstractMessageParser<T extends HttpMessage> implements NHttpMessageParser<T> {
-    
-    private final SessionInputBuffer sessionBuffer;    
-    
+
+    private final SessionInputBuffer sessionBuffer;
+
     private static final int READ_HEAD_LINE = 0;
     private static final int READ_HEADERS   = 1;
     private static final int COMPLETED      = 2;
-    
+
     private int state;
     private boolean endOfStream;
 
@@ -78,7 +78,7 @@ public abstract class AbstractMessagePar
 
     /**
      * Creates an instance of this class.
-     * 
+     *
      * @param buffer the session input buffer.
      * @param parser the line parser.
      * @param params HTTP parameters.
@@ -94,21 +94,21 @@ public abstract class AbstractMessagePar
         this.sessionBuffer = buffer;
         this.state = READ_HEAD_LINE;
         this.endOfStream = false;
-        this.headerBufs = new ArrayList<CharArrayBuffer>();        
+        this.headerBufs = new ArrayList<CharArrayBuffer>();
         this.maxLineLen = params.getIntParameter(
                 CoreConnectionPNames.MAX_LINE_LENGTH, -1);
         this.maxHeaderCount = params.getIntParameter(
                 CoreConnectionPNames.MAX_HEADER_COUNT, -1);
         this.lineParser = (parser != null) ? parser : BasicLineParser.DEFAULT;
     }
-    
+
     public void reset() {
         this.state = READ_HEAD_LINE;
         this.endOfStream = false;
         this.headerBufs.clear();
         this.message = null;
     }
-    
+
     public int fillBuffer(final ReadableByteChannel channel) throws IOException {
         int bytesRead = this.sessionBuffer.fill(channel);
         if (bytesRead == -1) {
@@ -116,23 +116,23 @@ public abstract class AbstractMessagePar
         }
         return bytesRead;
     }
-    
+
     /**
      * Creates {@link HttpMessage} instance based on the content of the input
      *  buffer containing the first line of the incoming HTTP message.
-     *  
+     *
      * @param buffer the line buffer.
      * @return HTTP message.
      * @throws HttpException in case of HTTP protocol violation
      * @throws ParseException in case of a parse error.
      */
-    protected abstract T createMessage(CharArrayBuffer buffer) 
+    protected abstract T createMessage(CharArrayBuffer buffer)
         throws HttpException, ParseException;
-    
+
     private void parseHeadLine() throws HttpException, ParseException {
         this.message = createMessage(this.lineBuf);
     }
-    
+
     private void parseHeader() throws IOException {
         CharArrayBuffer current = this.lineBuf;
         int count = this.headerBufs.size();
@@ -147,7 +147,7 @@ public abstract class AbstractMessagePar
                 }
                 i++;
             }
-            if (this.maxLineLen > 0 
+            if (this.maxLineLen > 0
                     && previous.length() + 1 + current.length() - i > this.maxLineLen) {
                 throw new IOException("Maximum line length limit exceeded");
             }
@@ -167,8 +167,8 @@ public abstract class AbstractMessagePar
                 this.lineBuf.clear();
             }
             boolean lineComplete = this.sessionBuffer.readLine(this.lineBuf, this.endOfStream);
-            if (this.maxLineLen > 0 && 
-                    (this.lineBuf.length() > this.maxLineLen || 
+            if (this.maxLineLen > 0 &&
+                    (this.lineBuf.length() > this.maxLineLen ||
                             (!lineComplete && this.sessionBuffer.length() > this.maxLineLen))) {
                 throw new IOException("Maximum line length limit exceeded");
             }
@@ -190,7 +190,7 @@ public abstract class AbstractMessagePar
                     if (this.maxHeaderCount > 0 && headerBufs.size() >= this.maxHeaderCount) {
                         throw new IOException("Maximum header count exceeded");
                     }
-                    
+
                     parseHeader();
                 } else {
                     this.state = COMPLETED;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java Fri Apr 23 19:11:53 2010
@@ -41,20 +41,20 @@ import org.apache.http.params.HttpParams
 import org.apache.http.util.CharArrayBuffer;
 
 /**
- * Abstract {@link NHttpMessageWriter} that serves as a base for all message 
+ * Abstract {@link NHttpMessageWriter} that serves as a base for all message
  * writer implementations.
  *
  * @since 4.0
  */
 public abstract class AbstractMessageWriter<T extends HttpMessage> implements NHttpMessageWriter<T> {
-    
-    protected final SessionOutputBuffer sessionBuffer;    
+
+    protected final SessionOutputBuffer sessionBuffer;
     protected final CharArrayBuffer lineBuf;
     protected final LineFormatter lineFormatter;
 
     /**
      * Creates an instance of this class.
-     * 
+     *
      * @param buffer the session output buffer.
      * @param formatter the line formatter.
      * @param params HTTP parameters.
@@ -71,13 +71,13 @@ public abstract class AbstractMessageWri
         this.lineFormatter = (formatter != null) ?
             formatter : BasicLineFormatter.DEFAULT;
     }
-    
+
     public void reset() {
     }
-    
+
     /**
      * Writes out the first line of {@link HttpMessage}.
-     * 
+     *
      * @param message HTTP message.
      * @throws HttpException in case of HTTP protocol violation
      */
@@ -96,5 +96,5 @@ public abstract class AbstractMessageWri
         this.lineBuf.clear();
         this.sessionBuffer.writeLine(this.lineBuf);
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java Fri Apr 23 19:11:53 2010
@@ -50,11 +50,11 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 public class ChunkDecoder extends AbstractContentDecoder {
-    
+
     private static final int READ_CONTENT   = 0;
     private static final int READ_FOOTERS  = 1;
     private static final int COMPLETED      = 2;
-    
+
     private int state;
     private boolean endOfChunk;
     private boolean endOfStream;
@@ -62,13 +62,13 @@ public class ChunkDecoder extends Abstra
     private CharArrayBuffer lineBuf;
     private int chunkSize;
     private int pos;
-    
+
     private final List<CharArrayBuffer> trailerBufs;
-    
+
     private Header[] footers;
-    
-    public ChunkDecoder(            
-            final ReadableByteChannel channel, 
+
+    public ChunkDecoder(
+            final ReadableByteChannel channel,
             final SessionInputBuffer buffer,
             final HttpTransportMetricsImpl metrics) {
         super(channel, buffer, metrics);
@@ -87,7 +87,7 @@ public class ChunkDecoder extends Abstra
             }
             int cr = this.buffer.read();
             int lf = this.buffer.read();
-            if (cr != HTTP.CR || lf != HTTP.LF) { 
+            if (cr != HTTP.CR || lf != HTTP.LF) {
                 throw new MalformedChunkCodingException("CRLF expected at end of chunk");
             }
             this.endOfChunk = false;
@@ -111,7 +111,7 @@ public class ChunkDecoder extends Abstra
             this.pos = 0;
         }
     }
-    
+
     private void parseHeader() {
         CharArrayBuffer current = this.lineBuf;
         int count = this.trailerBufs.size();
@@ -149,7 +149,7 @@ public class ChunkDecoder extends Abstra
         }
         this.trailerBufs.clear();
     }
-    
+
     public int read(final ByteBuffer dst) throws IOException {
         if (dst == null) {
             throw new IllegalArgumentException("Byte buffer may not be null");
@@ -157,7 +157,7 @@ public class ChunkDecoder extends Abstra
         if (this.state == COMPLETED) {
             return -1;
         }
-        
+
         int totalRead = 0;
         while (this.state != COMPLETED) {
 
@@ -170,10 +170,10 @@ public class ChunkDecoder extends Abstra
                     this.endOfStream = true;
                 }
             }
-            
+
             switch (this.state) {
             case READ_CONTENT:
-                
+
                 if (this.chunkSize == -1) {
                     readChunkHead();
                     if (this.chunkSize == -1) {
@@ -201,11 +201,11 @@ public class ChunkDecoder extends Abstra
                         this.state = COMPLETED;
                         this.completed = true;
                         throw new TruncatedChunkException("Truncated chunk "
-                                + "( expected size: " + this.chunkSize 
+                                + "( expected size: " + this.chunkSize
                                 + "; actual size: " + this.pos + ")");
                     }
                 }
-                
+
                 if (this.pos == this.chunkSize) {
                     // At the end of the chunk
                     this.chunkSize = -1;
@@ -258,5 +258,5 @@ public class ChunkDecoder extends Abstra
         buffer.append("]");
         return buffer.toString();
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java Fri Apr 23 19:11:53 2010
@@ -38,18 +38,18 @@ import org.apache.http.util.CharArrayBuf
 
 /**
  * Implements chunked transfer coding. The content is sent in small chunks.
- * Entities transferred using this decoder can be of unlimited length. 
+ * Entities transferred using this decoder can be of unlimited length.
  *
  * @since 4.0
  */
 public class ChunkEncoder extends AbstractContentEncoder {
-    
+
     private final CharArrayBuffer lineBuffer;
-    
+
     private final BufferInfo bufferinfo;
-    
+
     public ChunkEncoder(
-            final WritableByteChannel channel, 
+            final WritableByteChannel channel,
             final SessionOutputBuffer buffer,
             final HttpTransportMetricsImpl metrics) {
         super(channel, buffer, metrics);
@@ -70,7 +70,7 @@ public class ChunkEncoder extends Abstra
         if (chunk == 0) {
             return 0;
         }
-        
+
         long bytesWritten = this.buffer.flush(this.channel);
         if (bytesWritten > 0) {
             this.metrics.incrementBytesTransferred(bytesWritten);
@@ -121,7 +121,7 @@ public class ChunkEncoder extends Abstra
         this.buffer.writeLine(this.lineBuffer);
         this.completed = true; // == super.complete()
     }
-    
+
     @Override
     public String toString() {
         StringBuffer buffer = new StringBuffer();
@@ -130,5 +130,5 @@ public class ChunkEncoder extends Abstra
         buffer.append("]");
         return buffer.toString();
     }
-    
+
 }



Mime
View raw message