From 53b75296ad2ed0139328608a59edb91d58a4a8a1 Mon Sep 17 00:00:00 2001
From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 1 May 2007 12:46:12 +0000
Subject: [PATCH] - 42308: nextRequest recycles the request.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@534043 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/http11/Http11AprProcessor.java     | 10 ++++++----
 java/org/apache/coyote/http11/Http11AprProtocol.java      |  1 -
 java/org/apache/coyote/http11/Http11NioProcessor.java     | 10 ++++++----
 java/org/apache/coyote/http11/InternalNioInputBuffer.java |  1 -
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 61fc53aaa..7403fa4a2 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -880,6 +880,12 @@ public class Http11AprProcessor implements ActionHook {
             }
             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 @@ public class Http11AprProcessor implements ActionHook {
             error = true;
         }
 
-        // Next request
-        inputBuffer.nextRequest();
-        outputBuffer.nextRequest();
-        
     }
     
     
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 3a659b9fa..e846b8d13 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -20,7 +20,6 @@ package org.apache.coyote.http11;
 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;
diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 9d3f8bc6e..e6007695f 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -934,6 +934,12 @@ public class Http11NioProcessor implements ActionHook {
                 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) {
@@ -990,10 +996,6 @@ public class Http11NioProcessor implements ActionHook {
             error = true;
         }
 
-        // Next request
-        inputBuffer.nextRequest();
-        outputBuffer.nextRequest();
-
     }
 
 
diff --git a/java/org/apache/coyote/http11/InternalNioInputBuffer.java b/java/org/apache/coyote/http11/InternalNioInputBuffer.java
index 30d598ffd..c5309e0d9 100644
--- a/java/org/apache/coyote/http11/InternalNioInputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalNioInputBuffer.java
@@ -322,7 +322,6 @@ public class InternalNioInputBuffer implements InputBuffer {
         // 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;
-- 
2.11.0