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 2014/11/04 16:10:50 UTC
svn commit: r1636600 - in /tomcat/trunk/test/org/apache/coyote/http11:
TestGzipOutputFilter.java filters/TestGzipOutputFilter.java
filters/TesterOutputBuffer.java
Author: markt
Date: Tue Nov 4 15:10:50 2014
New Revision: 1636600
URL: http://svn.apache.org/r1636600
Log:
Remove dependency on BIO OutputBuffer impl
Added:
tomcat/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java
- copied, changed from r1636598, tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
- copied, changed from r1636598, tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
Removed:
tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
Copied: tomcat/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java (from r1636598, tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java?p2=tomcat/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java&p1=tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java&r1=1636598&r2=1636600&rev=1636600&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java Tue Nov 4 15:10:50 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.coyote.http11;
+package org.apache.coyote.http11.filters;
import java.io.ByteArrayOutputStream;
import java.util.zip.GZIPOutputStream;
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTru
import org.junit.Test;
import org.apache.coyote.Response;
-import org.apache.coyote.http11.filters.GzipOutputFilter;
import org.apache.tomcat.util.buf.ByteChunk;
/**
@@ -52,7 +51,7 @@ public class TestGzipOutputFilter {
public void testFlushingWithGzip() throws Exception {
// set up response, InternalOutputBuffer, and ByteArrayOutputStream
Response res = new Response();
- InternalOutputBuffer iob = new InternalOutputBuffer(res, 8 * 1024);
+ TesterOutputBuffer iob = new TesterOutputBuffer(res, 8 * 1024);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
iob.outputStream = bos;
res.setOutputBuffer(iob);
Copied: tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java (from r1636598, tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java?p2=tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java&p1=tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java&r1=1636598&r2=1636600&rev=1636600&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java Tue Nov 4 15:10:50 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.coyote.http11;
+package org.apache.coyote.http11.filters;
import java.io.IOException;
import java.io.OutputStream;
@@ -23,6 +23,7 @@ import java.net.Socket;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.coyote.http11.AbstractOutputBuffer;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SocketWrapper;
@@ -32,7 +33,7 @@ import org.apache.tomcat.util.net.Socket
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
*/
-public class InternalOutputBuffer extends AbstractOutputBuffer<Socket>
+public class TesterOutputBuffer extends AbstractOutputBuffer<Socket>
implements ByteChunk.ByteOutputChannel {
// ----------------------------------------------------------- Constructors
@@ -40,7 +41,7 @@ public class InternalOutputBuffer extend
/**
* Default constructor.
*/
- public InternalOutputBuffer(Response response, int headerBufferSize) {
+ public TesterOutputBuffer(Response response, int headerBufferSize) {
super(response, headerBufferSize);
@@ -120,14 +121,14 @@ public class InternalOutputBuffer extend
// ------------------------------------------------ HTTP/1.1 Output Methods
/**
- * Send an acknowledgment.
+ * Send an acknowledgement.
*/
@Override
public void sendAck()
throws IOException {
if (!committed)
- outputStream.write(Constants.ACK_BYTES);
+ outputStream.write(org.apache.coyote.http11.Constants.ACK_BYTES);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org