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 2015/01/01 18:14:15 UTC
svn commit: r1648902 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractOutputBuffer.java InternalAprOutputBuffer.java
InternalNio2OutputBuffer.java InternalNioOutputBuffer.java
Author: markt
Date: Thu Jan 1 17:14:15 2015
New Revision: 1648902
URL: http://svn.apache.org/r1648902
Log:
Pull up SocketOutputBuffer
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=1648902&r1=1648901&r2=1648902&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:14:15 2015
@@ -661,4 +661,32 @@ public abstract class AbstractOutputBuff
to.put(from);
from.limit(fromLimit);
}
+
+
+
+ // ------------------------------------------ SocketOutputBuffer 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 += len;
+ return len;
+ }
+
+ @Override
+ public long getBytesWritten() {
+ return byteCount;
+ }
+ }
}
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=1648902&r1=1648901&r2=1648902&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:15 2015
@@ -24,11 +24,9 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.apache.coyote.ByteBufferHolder;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.jni.Status;
-import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -297,34 +295,4 @@ public class InternalAprOutputBuffer ext
protected void registerWriteInterest() {
((AprEndpoint) endpoint).getPoller().add(socket, -1, false, true);
}
-
-
- // ----------------------------------- 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 += len;
- return len;
- }
-
- @Override
- public long getBytesWritten() {
- return byteCount;
- }
- }
}
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=1648902&r1=1648901&r2=1648902&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:15 2015
@@ -30,9 +30,7 @@ import java.util.concurrent.TimeoutExcep
import javax.servlet.RequestDispatcher;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
-import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
@@ -464,34 +462,4 @@ public class InternalNio2OutputBuffer ex
}
}
}
-
-
- // ----------------------------------- 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 += len;
- return len;
- }
-
- @Override
- public long getBytesWritten() {
- return byteCount;
- }
- }
}
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=1648902&r1=1648901&r2=1648902&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:15 2015
@@ -24,9 +24,7 @@ import java.nio.channels.Selector;
import java.util.Iterator;
import org.apache.coyote.ByteBufferHolder;
-import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
-import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
@@ -266,34 +264,4 @@ public class InternalNioOutputBuffer ext
}
att.getPoller().add(socket, SelectionKey.OP_WRITE);
}
-
-
- // ----------------------------------- 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 += len;
- return len;
- }
-
- @Override
- public long getBytesWritten() {
- return byteCount;
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org