Author: remm
Date: Wed Aug 15 08:59:28 2007
New Revision: 566237

URL: http://svn.apache.org/viewvc?view=rev&rev=566237
Log:
- Fix recycling glitch. I prefer using nextRequest although it's a bit slower, 
since it's identical to regular request
  processing.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?view=diff&rev=566237&r1=566236&r2=566237
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Wed Aug 15 08:59:28 2007
@@ -750,9 +750,13 @@
         rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
 
         if (error) {
+            inputBuffer.nextRequest();
+            outputBuffer.nextRequest();
             recycle();
             return SocketState.CLOSED;
         } else if (!comet) {
+            inputBuffer.nextRequest();
+            outputBuffer.nextRequest();
             recycle();
             return SocketState.OPEN;
         } else {
@@ -905,6 +909,8 @@
 
         if (comet) {
             if (error) {
+                inputBuffer.nextRequest();
+                outputBuffer.nextRequest();
                 recycle();
                 return SocketState.CLOSED;
             } else {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to