Author: markt
Date: Sun Jun 16 16:20:24 2013
New Revision: 1493526
URL: http://svn.apache.org/r1493526
Log:
Pull up common constructor code
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/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.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=1493526&r1=1493525&r2=1493526&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sun
Jun 16 16:20:24 2013
@@ -119,6 +119,24 @@ public abstract class AbstractOutputBuff
protected int bufferedWriteSize = 64*1024; //64k default write buffer
+ protected AbstractOutputBuffer(Response response, int headerBufferSize) {
+
+ this.response = response;
+
+ headerBuffer = new byte[headerBufferSize];
+
+ filterLibrary = new OutputFilter[0];
+ activeFilters = new OutputFilter[0];
+ lastActiveFilter = -1;
+
+ committed = false;
+ finished = false;
+
+ // Cause loading of HttpMessages
+ HttpMessages.getMessage(200);
+ }
+
+
// -------------------------------------------------------------- Variables
/**
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=1493526&r1=1493525&r2=1493526&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Sun
Jun 16 16:20:24 2013
@@ -28,7 +28,6 @@ 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.http.HttpMessages;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.SocketWrapper;
@@ -47,9 +46,8 @@ public class InternalAprOutputBuffer ext
*/
public InternalAprOutputBuffer(Response response, int headerBufferSize) {
- this.response = response;
+ super(response, headerBufferSize);
- headerBuffer = new byte[headerBufferSize];
if (headerBufferSize < (8 * 1024)) {
bbuf = ByteBuffer.allocateDirect(6 * 1500);
} else {
@@ -57,17 +55,6 @@ public class InternalAprOutputBuffer ext
}
outputStreamOutputBuffer = new SocketOutputBuffer();
-
- filterLibrary = new OutputFilter[0];
- activeFilters = new OutputFilter[0];
- lastActiveFilter = -1;
-
- committed = false;
- finished = false;
-
- // Cause loading of HttpMessages
- HttpMessages.getMessage(200);
-
}
@@ -362,7 +349,7 @@ public class InternalAprOutputBuffer ext
int len = chunk.getLength();
int start = chunk.getStart();
byte[] b = chunk.getBuffer();
- addToBB(b, start,len);
+ addToBB(b, start, len);
byteCount += chunk.getLength();
return chunk.getLength();
}
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=1493526&r1=1493525&r2=1493526&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Sun
Jun 16 16:20:24 2013
@@ -27,7 +27,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
@@ -49,22 +48,9 @@ public class InternalNioOutputBuffer ext
*/
public InternalNioOutputBuffer(Response response, int headerBufferSize) {
- this.response = response;
-
- headerBuffer = new byte[headerBufferSize];
+ super(response, headerBufferSize);
outputStreamOutputBuffer = new SocketOutputBuffer();
-
- filterLibrary = new OutputFilter[0];
- activeFilters = new OutputFilter[0];
- lastActiveFilter = -1;
-
- committed = false;
- finished = false;
-
- // Cause loading of HttpMessages
- HttpMessages.getMessage(200);
-
}
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=1493526&r1=1493525&r2=1493526&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Sun
Jun 16 16:20:24 2013
@@ -42,22 +42,12 @@ public class InternalOutputBuffer extend
*/
public InternalOutputBuffer(Response response, int headerBufferSize) {
- this.response = response;
-
- headerBuffer = new byte[headerBufferSize];
+ super(response, headerBufferSize);
outputStreamOutputBuffer = new OutputStreamOutputBuffer();
- filterLibrary = new OutputFilter[0];
- activeFilters = new OutputFilter[0];
- lastActiveFilter = -1;
-
socketBuffer = new ByteChunk();
socketBuffer.setByteOutputChannel(this);
-
- committed = false;
- finished = false;
-
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
