Start to align process method

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154583 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index f92bee1..1333bc6 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -161,6 +161,9 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
      * Process pipelined HTTP requests using the specified input and output
      * streams.
      *
+     * @param socketWrapper Socket from which the HTTP requests will be read
+     *               and the HTTP responses will be written.
+     *  
      * @throws IOException error during an I/O operation
      */
     @Override
@@ -177,8 +180,8 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
 
         // Error flag
         error = false;
-        comet = false;
         keepAlive = true;
+        comet = false;
 
         int keepAliveLeft = maxKeepAliveRequests;
         long soTimeout = endpoint.getSoTimeout();

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 599776b..2eb0f99 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -192,6 +192,9 @@ public class Http11NioProcessor extends AbstractHttp11Processor<NioChannel> {
      * Process pipelined HTTP requests using the specified input and output
      * streams.
      *
+     * @param socketWrapper Socket from which the HTTP requests will be read
+     *               and the HTTP responses will be written.
+     *  
      * @throws IOException error during an I/O operation
      */
     @Override

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 0b87894..6ce5daf 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -122,7 +122,8 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
 
 
     /**
-     * Process pipelined HTTP requests on the specified socket.
+     * Process pipelined HTTP requests using the specified input and output
+     * streams.
      *
      * @param socketWrapper Socket from which the HTTP requests will be read
      *               and the HTTP responses will be written.