Pull up common getExecutor code

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

diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java
index 20d29c8..7cc47f3 100644 (file)
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote;
 
+import java.util.concurrent.Executor;
+
 import org.apache.tomcat.util.net.AbstractEndpoint;
 
 public abstract class AbstractProcessor implements ActionHook, Processor {
@@ -25,4 +27,9 @@ public abstract class AbstractProcessor implements ActionHook, Processor {
     protected AbstractEndpoint getEndpoint() {
         return endpoint;
     }
+    
+    @Override
+    public Executor getExecutor() {
+        return endpoint.getExecutor();
+    }
 }

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
index 7c69da3..ea3306b 100644 (file)
--- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -23,7 +23,6 @@ import java.net.InetAddress;
 import java.security.NoSuchProviderException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.coyote.AbstractProcessor;
@@ -398,10 +397,6 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor {
    protected abstract void finish() throws IOException;
    
    
-   @Override
-   public abstract Executor getExecutor();
-
-   
    public void recycle() {
        asyncStateMachine.recycle();
 

diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java
index 434b2f2..783d54a 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -20,7 +20,6 @@ package org.apache.coyote.ajp;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.nio.ByteBuffer;
-import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.OutputBuffer;
@@ -384,12 +383,6 @@ public class AjpAprProcessor extends AbstractAjpProcessor {
     }
 
     
-    @Override
-    public Executor getExecutor() {
-        return endpoint.getExecutor();
-    }
-    
-    
     // ----------------------------------------------------- ActionHook Methods
 
 

diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java
index 8f0396f..4027d91 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpNioProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpNioProcessor.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.Selector;
-import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.OutputBuffer;
@@ -372,12 +371,6 @@ public class AjpNioProcessor extends AbstractAjpProcessor {
     }
 
     
-    @Override
-    public Executor getExecutor() {
-        return endpoint.getExecutor();
-    }
-    
-    
     // ----------------------------------------------------- ActionHook Methods
 
 

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 207fe69..1800929 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.net.Socket;
-import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.OutputBuffer;
@@ -383,12 +382,6 @@ public class AjpProcessor extends AbstractAjpProcessor {
     }
 
     
-    @Override
-    public Executor getExecutor() {
-        return endpoint.getExecutor();
-    }
-    
-    
     // ----------------------------------------------------- ActionHook Methods
 
 

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 59fb424..52a6da4 100644 (file)
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -18,7 +18,6 @@ package org.apache.coyote.http11;
 
 import java.io.IOException;
 import java.util.StringTokenizer;
-import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
@@ -1004,9 +1003,6 @@ public abstract class AbstractHttp11Processor extends AbstractProcessor {
     
     protected abstract void recycleInternal();
 
-    @Override
-    public abstract Executor getExecutor();
-    
     protected boolean isAsync() {
         return asyncStateMachine.isAsync();
     }

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 60358e6..f4e9849 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -23,7 +23,6 @@ import java.io.InterruptedIOException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Locale;
-import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Request;
@@ -927,9 +926,4 @@ public class Http11AprProcessor extends AbstractHttp11Processor {
     protected AbstractOutputBuffer getOutputBuffer() {
         return outputBuffer;
     }
-    
-    @Override
-    public Executor getExecutor() {
-        return endpoint.getExecutor();
-    }
 }

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 273d514..43be314 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -21,7 +21,6 @@ import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.nio.channels.SelectionKey;
 import java.util.Locale;
-import java.util.concurrent.Executor;
 
 import javax.net.ssl.SSLEngine;
 
@@ -1002,9 +1001,4 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
     public void setSslSupport(SSLSupport sslSupport) {
         this.sslSupport = sslSupport;
     }
-
-    @Override
-    public Executor getExecutor() {
-        return endpoint.getExecutor();
-    }
 }

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index f14c8c2..dfd70ea 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -23,7 +23,6 @@ import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.util.Locale;
-import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Request;
@@ -881,9 +880,4 @@ public class Http11Processor extends AbstractHttp11Processor {
         super.setSocketBuffer(socketBuffer);
         outputBuffer.setSocketBuffer(socketBuffer);
     }
-
-    @Override
-    public Executor getExecutor() {
-        return endpoint.getExecutor();
-    }
 }