Author: markt
Date: Thu Jan 8 21:00:43 2015
New Revision: 1650376
URL: http://svn.apache.org/r1650376
Log:
Http11OutputBuffer no longer needs to reference a Socket type
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1650376&r1=1650375&r2=1650376&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Jan 8 21:00:43 2015
@@ -78,7 +78,7 @@ public abstract class AbstractHttp11Proc
/**
* Output.
*/
- protected Http11OutputBuffer<S> outputBuffer;
+ protected Http11OutputBuffer outputBuffer;
/**
@@ -624,7 +624,7 @@ public abstract class AbstractHttp11Proc
* Exposes output buffer to super class to allow better code re-use.
* @return The output buffer used by the processor.
*/
- protected Http11OutputBuffer<S> getOutputBuffer() {
+ protected Http11OutputBuffer getOutputBuffer() {
return outputBuffer;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1650376&r1=1650375&r2=1650376&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Jan
8 21:00:43 2015
@@ -60,7 +60,7 @@ public class Http11AprProcessor extends
inputBuffer = new InternalAprInputBuffer(request, headerBufferSize);
request.setInputBuffer(getInputBuffer());
- outputBuffer = new Http11OutputBuffer<>(response, headerBufferSize);
+ outputBuffer = new Http11OutputBuffer(response, headerBufferSize);
response.setOutputBuffer(getOutputBuffer());
initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1650376&r1=1650375&r2=1650376&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Thu Jan
8 21:00:43 2015
@@ -64,7 +64,7 @@ public class Http11Nio2Processor extends
inputBuffer = new InternalNio2InputBuffer(request, maxHttpHeaderSize);
request.setInputBuffer(getInputBuffer());
- outputBuffer = new Http11OutputBuffer<>(response, maxHttpHeaderSize);
+ outputBuffer = new Http11OutputBuffer(response, maxHttpHeaderSize);
response.setOutputBuffer(getOutputBuffer());
initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1650376&r1=1650375&r2=1650376&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Jan
8 21:00:43 2015
@@ -65,7 +65,7 @@ public class Http11NioProcessor extends
inputBuffer = new InternalNioInputBuffer(request, maxHttpHeaderSize);
request.setInputBuffer(getInputBuffer());
- outputBuffer = new Http11OutputBuffer<>(response, maxHttpHeaderSize);
+ outputBuffer = new Http11OutputBuffer(response, maxHttpHeaderSize);
response.setOutputBuffer(getOutputBuffer());
initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1650376&r1=1650375&r2=1650376&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Thu Jan
8 21:00:43 2015
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.http.HttpM
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
-public class Http11OutputBuffer<S> implements OutputBuffer {
+public class Http11OutputBuffer implements OutputBuffer {
// ----------------------------------------------------- Instance Variables
@@ -93,7 +93,7 @@ public class Http11OutputBuffer<S> imple
/**
* Wrapper for socket where data will be written to.
*/
- protected SocketWrapperBase<S> socketWrapper;
+ protected SocketWrapperBase<?> socketWrapper;
/**
@@ -340,7 +340,7 @@ public class Http11OutputBuffer<S> imple
}
- public void init(SocketWrapperBase<S> socketWrapper) {
+ public void init(SocketWrapperBase<?> socketWrapper) {
this.socketWrapper = socketWrapper;
// TODO: Ensure write buffer is >= header buffer size
}
Modified:
tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java?rev=1650376&r1=1650375&r2=1650376&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
Thu Jan 8 21:00:43 2015
@@ -18,7 +18,6 @@ package org.apache.coyote.http11.filters
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.net.Socket;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
@@ -29,7 +28,7 @@ import org.apache.tomcat.util.net.Socket
/**
* Output buffer for use in unit tests. This is a minimal implementation.
*/
-public class TesterOutputBuffer extends Http11OutputBuffer<Socket> {
+public class TesterOutputBuffer extends Http11OutputBuffer {
/**
* Underlying output stream.
@@ -46,7 +45,7 @@ public class TesterOutputBuffer extends
// --------------------------------------------------------- Public Methods
@Override
- public void init(SocketWrapperBase<Socket> socketWrapper) {
+ public void init(SocketWrapperBase<?> socketWrapper) {
// NO-OP: Unused
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
