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/01 17:56:59 UTC
svn commit: r1478062 - in /tomcat/trunk/java/org/apache/coyote/http11:
InternalAprOutputBuffer.java InternalNioOutputBuffer.java
InternalOutputBuffer.java
Author: markt
Date: Wed May 1 15:56:59 2013
New Revision: 1478062
URL: http://svn.apache.org/r1478062
Log:
Better comments. Move inner classes to end
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.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=1478062&r1=1478061&r2=1478062&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Wed May 1 15:56:59 2013
@@ -209,7 +209,7 @@ public class InternalAprOutputBuffer ext
}
- //------------------------------------------------------ Non-blocking writes
+ //-------------------------------------------------- Non-blocking IO methods
@Override
protected boolean hasDataToWrite() {
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=1478062&r1=1478061&r2=1478062&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Wed May 1 15:56:59 2013
@@ -380,39 +380,7 @@ public class InternalNioOutputBuffer ext
}
- // ----------------------------------- OutputStreamOutputBuffer Inner Class
-
- /**
- * This class is an output buffer which will write data to an output
- * stream.
- */
- 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();
- addToBB(b, start, len);
- byteCount += chunk.getLength();
- return chunk.getLength();
- }
-
- @Override
- public long getBytesWritten() {
- return byteCount;
- }
- }
-
-
- //------------------------------------------------------ Non-blocking writes
+ //-------------------------------------------------- Non-blocking IO methods
@Override
public void setBlocking(boolean blocking) {
@@ -449,4 +417,36 @@ public class InternalNioOutputBuffer ext
public int getBufferedWriteSize() {
return bufferedWriteSize;
}
+
+
+ // ----------------------------------- OutputStreamOutputBuffer Inner Class
+
+ /**
+ * This class is an output buffer which will write data to an output
+ * stream.
+ */
+ 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();
+ addToBB(b, start, len);
+ byteCount += chunk.getLength();
+ return chunk.getLength();
+ }
+
+ @Override
+ public long getBytesWritten() {
+ return byteCount;
+ }
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1478062&r1=1478061&r2=1478062&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Wed May 1 15:56:59 2013
@@ -217,7 +217,7 @@ public class InternalOutputBuffer extend
}
- //------------------------------------------------------ Non-blocking writes
+ //-------------------------------------------------- Non-blocking IO methods
@Override
protected boolean hasDataToWrite() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org