Author: markt
Date: Thu Jan 1 17:13:54 2015
New Revision: 1648898
URL: http://svn.apache.org/r1648898
Log:
Pull up hasMoreDataToFlush()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.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=1648898&r1=1648897&r2=1648898&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu
Jan 1 17:13:54 2015
@@ -588,10 +588,15 @@ public abstract class AbstractOutputBuff
//------------------------------------------------------ Non-blocking
writes
- protected abstract boolean hasMoreDataToFlush();
protected abstract void registerWriteInterest() throws IOException;
+ protected boolean hasMoreDataToFlush() {
+ return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
+ (!writeBufferFlipped && socketWriteBuffer.position() > 0);
+ }
+
+
/**
* Writes any remaining buffered data.
*
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1648898&r1=1648897&r2=1648898&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu
Jan 1 17:13:54 2015
@@ -297,8 +297,7 @@ public class InternalAprOutputBuffer ext
@Override
protected synchronized boolean hasMoreDataToFlush() {
- return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
- (!writeBufferFlipped && socketWriteBuffer.position() > 0);
+ return super.hasMoreDataToFlush();
}
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=1648898&r1=1648897&r2=1648898&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
Thu Jan 1 17:13:54 2015
@@ -455,12 +455,6 @@ public class InternalNio2OutputBuffer ex
}
@Override
- protected boolean hasMoreDataToFlush() {
- return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
- (!writeBufferFlipped && socketWriteBuffer.position() > 0);
- }
-
- @Override
protected boolean hasBufferedData() {
return bufferedWrites.size() > 0;
}
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=1648898&r1=1648897&r2=1648898&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu
Jan 1 17:13:54 2015
@@ -258,13 +258,6 @@ public class InternalNioOutputBuffer ext
@Override
- protected boolean hasMoreDataToFlush() {
- return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
- (!writeBufferFlipped && socketWriteBuffer.position() > 0);
- }
-
-
- @Override
protected void registerWriteInterest() throws IOException {
NioEndpoint.NioSocketWrapper att =
(NioEndpoint.NioSocketWrapper)socket.getAttachment();
if (att == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
