Author: markt
Date: Sat Jan 28 20:28:57 2012
New Revision: 1237155
URL: http://svn.apache.org/viewvc?rev=1237155&view=rev
Log:
Re-ordering. Align recycle() and nextRequest()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237155&r1=1237154&r2=1237155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat
Jan 28 20:28:57 2012
@@ -262,8 +262,9 @@ public abstract class AbstractOutputBuff
for (int i = 0; i <= lastActiveFilter; i++) {
activeFilters[i].recycle();
}
- // Recycle Request object
+ // Recycle response object
response.recycle();
+ // Reset pointers
pos = 0;
lastActiveFilter = -1;
committed = false;
@@ -278,14 +279,12 @@ public abstract class AbstractOutputBuff
* to parse the next HTTP request.
*/
public void nextRequest() {
-
- // Recycle Request object
- response.recycle();
// Recycle filters
for (int i = 0; i <= lastActiveFilter; i++) {
activeFilters[i].recycle();
}
-
+ // Recycle response object
+ response.recycle();
// Reset pointers
pos = 0;
lastActiveFilter = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
