Author: markt
Date: Tue Aug 23 10:41:02 2011
New Revision: 1160611
URL: http://svn.apache.org/viewvc?rev=1160611&view=rev
Log:
Organise code. No functional change.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.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=1160611&r1=1160610&r2=1160611&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Tue Aug
23 10:41:02 2011
@@ -458,11 +458,6 @@ public abstract class AbstractAjpProcess
}
}
- // Methods called by action()
- protected abstract void actionInternal(ActionCode actionCode, Object
param);
- protected abstract void flush(boolean tbd) throws IOException;
- protected abstract void finish() throws IOException;
-
@Override
public SocketState asyncDispatch(SocketStatus status) {
@@ -506,12 +501,6 @@ public abstract class AbstractAjpProcess
@Override
- protected final boolean isComet() {
- // AJP does not support Comet
- return false;
- }
-
- @Override
public SocketState event(SocketStatus status) throws IOException {
// Should never reach this code but in case we do...
throw new IOException(
@@ -541,8 +530,25 @@ public abstract class AbstractAjpProcess
byteCount = 0;
}
+
// ------------------------------------------------------ Protected Methods
+ // Methods called by action()
+ protected abstract void actionInternal(ActionCode actionCode, Object
param);
+ protected abstract void flush(boolean tbd) throws IOException;
+ protected abstract void finish() throws IOException;
+
+ // Methods called by prepareResponse()
+ protected abstract void output(byte[] src, int offset, int length)
+ throws IOException;
+
+
+ @Override
+ protected final boolean isComet() {
+ // AJP does not support Comet
+ return false;
+ }
+
/**
* After reading the request headers, we have to setup the request filters.
@@ -855,8 +861,7 @@ public abstract class AbstractAjpProcess
* When committing the response, we have to validate the set of headers, as
* well as setup the response filters.
*/
- protected void prepareResponse()
- throws IOException {
+ protected void prepareResponse() throws IOException {
response.setCommitted(true);
@@ -917,10 +922,6 @@ public abstract class AbstractAjpProcess
responseHeaderMessage.getLen());
}
- // Methods called by prepareResponse()
- protected abstract void output(byte[] src, int offset, int length)
- throws IOException;
-
// ------------------------------------- InputStreamInputBuffer Inner Class
@@ -929,8 +930,7 @@ public abstract class AbstractAjpProcess
* This class is an input buffer which will read its data from an input
* stream.
*/
- protected class SocketInputBuffer
- implements InputBuffer {
+ protected class SocketInputBuffer implements InputBuffer {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
