Author: markt
Date: Tue Jan 25 17:15:33 2011
New Revision: 1063364
URL: http://svn.apache.org/viewvc?rev=1063364&view=rev
Log:
Ensure correct cycling if input filters
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1063364&r1=1063363&r2=1063364&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Tue
Jan 25 17:15:33 2011
@@ -144,11 +144,12 @@ public class InternalNioInputBuffer exte
*/
@Override
public void recycle() {
- super.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;
parsingRequestLine = true;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1063364&r1=1063363&r2=1063364&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 25 17:15:33 2011
@@ -106,6 +106,14 @@
Prevent possible thread exhaustion if a Comet timeout event takes a
while to complete. (markt)
</fix>
+ <fix>
+ Prvent multiple Comet END events if the CometServlet calls
+ <code>event.close()</code> during an END event. (markt)
+ </fix>
+ <fix>
+ Ensure correct recycling of NIO input filters when processing Comet
+ events. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -198,10 +206,6 @@
for explicit additional arguments for the executable. Those were
broken when implementing fix for bug <bug>49657</bug>. (kkolinko)
</fix>
- <fix>
- Prvent multiple Comet END events if the CometServlet calls
- <code>event.close()</code> during an END event. (markt)
- </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
