You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/05/09 22:22:01 UTC
svn commit: r1480759 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractOutputBuffer.java InternalNioOutputBuffer.java
Author: markt
Date: Thu May 9 20:22:01 2013
New Revision: 1480759
URL: http://svn.apache.org/r1480759
Log:
Missed a few things with the refactoring to remove SET_WRITE_LISTENER
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.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=1480759&r1=1480758&r2=1480759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu May 9 20:22:01 2013
@@ -316,6 +316,7 @@ public abstract class AbstractOutputBuff
public void recycle() {
// Sub-classes may wish to do more than this.
nextRequest();
+ bufferedWrites.clear();
}
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1480759&r1=1480758&r2=1480759&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu May 9 20:22:01 2013
@@ -96,7 +96,6 @@ public class InternalNioOutputBuffer ext
socket = null;
}
flipped = false;
- bufferedWrites.clear();
}
@@ -252,7 +251,7 @@ public class InternalNioOutputBuffer ext
dataLeft = hasMoreDataToFlush();
- if (!dataLeft && bufferedWrites!=null) {
+ if (!dataLeft && bufferedWrites.size() > 0) {
Iterator<ByteBufferHolder> bufIter = bufferedWrites.iterator();
while (!hasMoreDataToFlush() && bufIter.hasNext()) {
ByteBufferHolder buffer = bufIter.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org