Author: markt
Date: Wed Nov 12 10:49:34 2014
New Revision: 1638755
URL: http://svn.apache.org/r1638755
Log:
Pull up output method
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1638755&r1=1638754&r2=1638755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Nov
12 10:49:34 2014
@@ -922,10 +922,6 @@ public abstract class AbstractAjpProcess
// ------------------------------------------------------ Protected Methods
- // Methods called by prepareResponse()
- protected abstract int output(byte[] src, int offset, int length,
- boolean block) throws IOException;
-
// Methods called by process()
protected abstract void setupSocket(SocketWrapperBase<S> socketWrapper)
throws IOException;
@@ -1537,6 +1533,15 @@ public abstract class AbstractAjpProcess
}
+ private int output(byte[] src, int offset, int length,
+ boolean block) throws IOException {
+ if (socketWrapper == null || socketWrapper.getSocket() == null)
+ return -1;
+
+ return socketWrapper.write(block, src, offset, length);
+ }
+
+
private boolean available() {
if (endOfStream) {
return false;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1638755&r1=1638754&r2=1638755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Nov 12
10:49:34 2014
@@ -81,14 +81,6 @@ public class AjpAprProcessor extends Abs
@Override
- protected int output(byte[] src, int offset, int length, boolean block)
- throws IOException {
-
- return socketWrapper.write(block, src, offset, length);
- }
-
-
- @Override
protected boolean read(byte[] buf, int pos, int n, boolean block)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java?rev=1638755&r1=1638754&r2=1638755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java Wed Nov 12
10:49:34 2014
@@ -70,16 +70,6 @@ public class AjpNio2Processor extends Ab
@Override
- protected int output(byte[] src, int offset, int length, boolean block)
throws IOException {
-
- if (socketWrapper == null || socketWrapper.getSocket() == null)
- return -1;
-
- return socketWrapper.write(block, src, offset, length);
- }
-
-
- @Override
protected boolean read(byte[] buf, int pos, int n, boolean blockFirstRead)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1638755&r1=1638754&r2=1638755&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Nov 12
10:49:34 2014
@@ -85,12 +85,6 @@ public class AjpNioProcessor extends Abs
@Override
- protected int output(byte[] src, int offset, int length, boolean block)
throws IOException {
- return socketWrapper.write(block, src, offset, length);
- }
-
-
- @Override
protected boolean read(byte[] buf, int pos, int n, boolean blockFirstRead)
throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
