svn commit: r534043 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11AprProtocol.java Http11NioProcessor.java InternalNioInputBuffer.java

[remm]

Author: remm
Date: Tue May  1 05:46:12 2007
New Revision: 534043

URL: http://svn.apache.org/viewvc?view=rev&rev=534043
Log:
- 42308: nextRequest recycles the request.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
    tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.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=534043&r1=534042&r2=534043
==============================================================================
--- 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 
Tue May  1 05:46:12 2007
@@ -880,6 +880,12 @@
             }
             request.updateCounters();
 
+            if (!comet) {
+                // Next request
+                inputBuffer.nextRequest();
+                outputBuffer.nextRequest();
+            }
+            
             // Do sendfile as needed: add socket to sendfile and end
             if (sendfileData != null && !error) {
                 sendfileData.socket = socket;
@@ -933,10 +939,6 @@
             error = true;
         }
 
-        // Next request
-        inputBuffer.nextRequest();
-        outputBuffer.nextRequest();
-        
     }
     
     

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?view=diff&rev=534043&r1=534042&r2=534043
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
Tue May  1 05:46:12 2007
@@ -20,7 +20,6 @@
 import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?view=diff&rev=534043&r1=534042&r2=534043
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
Tue May  1 05:46:12 2007
@@ -934,6 +934,12 @@
                 response.setStatus(500);
             }
             request.updateCounters();
+
+            if (!comet) {
+                // Next request
+                inputBuffer.nextRequest();
+                outputBuffer.nextRequest();
+            }
             
             // Do sendfile as needed: add socket to sendfile and end
             if (sendfileData != null && !error) {
@@ -989,10 +995,6 @@
             log.error(sm.getString("http11processor.response.finish"), t);
             error = true;
         }
-
-        // Next request
-        inputBuffer.nextRequest();
-        outputBuffer.nextRequest();
 
     }
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?view=diff&rev=534043&r1=534042&r2=534043
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
Tue May  1 05:46:12 2007
@@ -322,7 +322,6 @@
         // Recycle Request object
         request.recycle();
 
-        //System.out.println("LV-pos: " + (lastValid - pos));
         // Copy leftover bytes to the beginning of the buffer
         if (lastValid - pos > 0) {
             int npos = 0;



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