Author: remm
Date: Fri Apr 18 20:02:38 2014
New Revision: 1588553
URL: http://svn.apache.org/r1588553
Log:
Allow some method override since it is a bit too convoluted with NIO2.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.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=1588553&r1=1588552&r2=1588553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Fri
Apr 18 20:02:38 2014
@@ -656,12 +656,12 @@ public abstract class AbstractOutputBuff
}
- public final boolean hasDataToWrite() {
+ public boolean hasDataToWrite() {
return hasMoreDataToFlush() || hasBufferedData();
}
- private boolean hasBufferedData() {
+ protected boolean hasBufferedData() {
boolean result = false;
if (bufferedWrites!=null) {
Iterator<ByteBufferHolder> iter = bufferedWrites.iterator();
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1588553&r1=1588552&r2=1588553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Fri Apr 18 20:02:38 2014
@@ -462,14 +462,22 @@ public class InternalNio2OutputBuffer ex
@Override
- protected boolean hasMoreDataToFlush() {
+ public boolean hasDataToWrite() {
synchronized (completionHandler) {
- return (flipped &&
socket.getSocket().getBufHandler().getWriteBuffer().remaining() > 0) ||
- (!flipped &&
socket.getSocket().getBufHandler().getWriteBuffer().position() > 0) ||
- bufferedWrites.size() > 0 || e != null;
+ return hasMoreDataToFlush() || hasBufferedData() || e != null;
}
}
+ @Override
+ protected boolean hasMoreDataToFlush() {
+ return (flipped &&
socket.getSocket().getBufHandler().getWriteBuffer().remaining() > 0) ||
+ (!flipped &&
socket.getSocket().getBufHandler().getWriteBuffer().position() > 0);
+ }
+
+ @Override
+ protected boolean hasBufferedData() {
+ return bufferedWrites.size() > 0;
+ }
@Override
public void registerWriteInterest() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
