tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1334790 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractInputBuffer.java java/org/apache/coyote/http11/InternalNioInputBuffer.java webapps/docs/changelog.xml
Date Sun, 06 May 2012 21:33:36 GMT
Author: markt
Date: Sun May  6 21:33:36 2012
New Revision: 1334790

URL: http://svn.apache.org/viewvc?rev=1334790&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
Ensure input filters are recycled when the request is recycled for all connectors.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
    tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1334787

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1334790&r1=1334789&r2=1334790&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Sun May  6
21:33:36 2012
@@ -248,6 +248,11 @@ public abstract class AbstractInputBuffe
         // Recycle Request object
         request.recycle();
 
+        // Recycle filters
+        for (int i = 0; i <= lastActiveFilter; i++) {
+            activeFilters[i].recycle();
+        }
+
         lastValid = 0;
         pos = 0;
         lastActiveFilter = -1;

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1334790&r1=1334789&r2=1334790&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Sun May
 6 21:33:36 2012
@@ -175,11 +175,6 @@ public class InternalNioInputBuffer exte
      */
     @Override
     public void recycle() {
-        // Recycle filters
-        for (int i = 0; i <= lastActiveFilter; i++) {
-            activeFilters[i].recycle();
-        }
-        // This must be after filters since it resets the lastFilterIndex
         super.recycle();
         socket = null;
         headerParsePos = HeaderParsePosition.HEADER_START;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1334790&r1=1334789&r2=1334790&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun May  6 21:33:36 2012
@@ -90,6 +90,10 @@
   <subsection name="Coyote">
     <changelog>
       <fix>
+        <bug>52055</bug>: Additional fix required to ensure that
+        <code>InputFilter</code>s are recycled between requests. (markt)
+      </fix>
+      <fix>
         <bug>53173</bug> (<rev>1333116</rev>) :
         Properly count down maxConnections (fhanik)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message