Author: markt
Date: Thu Jan 1 17:14:03 2015
New Revision: 1648900
URL: http://svn.apache.org/r1648900
Log:
Align SocketOutputBuffer implementations
Modified:
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/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1648900&r1=1648899&r2=1648900&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:14:03 2015
@@ -317,8 +317,8 @@ public class InternalAprOutputBuffer ext
int start = chunk.getStart();
byte[] b = chunk.getBuffer();
addToBB(b, start, len);
- byteCount += chunk.getLength();
- return chunk.getLength();
+ byteCount += len;
+ return len;
}
@Override
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=1648900&r1=1648899&r2=1648900&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:14:03 2015
@@ -473,11 +473,13 @@ public class InternalNio2OutputBuffer ex
*/
protected class SocketOutputBuffer implements OutputBuffer {
+
/**
* Write chunk.
*/
@Override
public int doWrite(ByteChunk chunk, Response res) throws IOException {
+
int len = chunk.getLength();
int start = chunk.getStart();
byte[] b = chunk.getBuffer();
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=1648900&r1=1648899&r2=1648900&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:14:03 2015
@@ -286,8 +286,8 @@ public class InternalNioOutputBuffer ext
int start = chunk.getStart();
byte[] b = chunk.getBuffer();
addToBB(b, start, len);
- byteCount += chunk.getLength();
- return chunk.getLength();
+ byteCount += len;
+ return len;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
