Pull up common code

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

diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java
index 92c6f8e..912dc25 100644 (file)
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -19,6 +19,7 @@ package org.apache.coyote;
 import java.util.concurrent.Executor;
 
 import org.apache.tomcat.util.net.AbstractEndpoint;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 
 /**
  * Provides functionality and attributes common to all supported protocols
@@ -82,11 +83,6 @@ public abstract class AbstractProcessor implements ActionHook, Processor {
     }
 
 
-
-    /*
-     * Expose selected endpoint attributes through the processor
-     */
-
     /**
      * Obtain the Executor used by the underlying endpoint.
      */
@@ -94,4 +90,14 @@ public abstract class AbstractProcessor implements ActionHook, Processor {
     public Executor getExecutor() {
         return endpoint.getExecutor();
     }
+    
+    
+    public boolean isAsync() {
+        return asyncStateMachine.isAsync();
+    }
+
+
+    public SocketState asyncPostProcess() {
+        return asyncStateMachine.asyncPostProcess();
+    }
 }

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
index 786a6a9..6a813c2 100644 (file)
--- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -871,14 +871,6 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor {
            throws IOException;
    
    
-   protected boolean isAsync() {
-       return asyncStateMachine.isAsync();
-   }
-   
-   protected SocketState asyncPostProcess() {
-       return asyncStateMachine.asyncPostProcess();
-   }
-
    // ------------------------------------- InputStreamInputBuffer Inner Class
 
 

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index d7a38dc..3ece26b 100644 (file)
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -42,7 +42,6 @@ import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.AbstractEndpoint;
-import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.res.StringManager;
 
 public abstract class AbstractHttp11Processor extends AbstractProcessor {
@@ -1023,12 +1022,4 @@ public abstract class AbstractHttp11Processor extends AbstractProcessor {
     }
     
     protected abstract void recycleInternal();
-
-    protected boolean isAsync() {
-        return asyncStateMachine.isAsync();
-    }
-    
-    protected SocketState asyncPostProcess() {
-        return asyncStateMachine.asyncPostProcess();
-    }
 }