From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 23 Aug 2011 10:41:02 +0000 (+0000)
Subject: Organise code. No functional change.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0823e14fad500f4063ace14cca2b4238d0d7a8cc;p=tomcat7.0

Organise code. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160611 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
index 9ee30e8a8..fc30163b8 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -458,11 +458,6 @@ public abstract class AbstractAjpProcessor<S> extends AbstractProcessor<S> {
         }
     }
 
-    // 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 AbstractAjpProcessor<S> extends AbstractProcessor<S> {
 
 
     @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 AbstractAjpProcessor<S> extends AbstractProcessor<S> {
         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 AbstractAjpProcessor<S> extends AbstractProcessor<S> {
      * 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 AbstractAjpProcessor<S> extends AbstractProcessor<S> {
                 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 AbstractAjpProcessor<S> extends AbstractProcessor<S> {
      * 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 {
 
 
         /**