More re-factoring: expose the Executor

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

diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 4ae083a..9226fd2 100644 (file)
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http11;
 
 import java.io.IOException;
 import java.util.StringTokenizer;
+import java.util.concurrent.Executor;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -1089,4 +1090,6 @@ public abstract class AbstractHttp11Processor {
     }
     
     protected abstract void recycleInternal();
+    
+    protected abstract Executor getExecutor();
 }

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 89a2a85..b45b785 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -23,6 +23,7 @@ import java.io.InterruptedIOException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Locale;
+import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.coyote.ActionCode;
@@ -915,4 +916,9 @@ public class Http11AprProcessor extends AbstractHttp11Processor implements Actio
     protected AbstractOutputBuffer getOutputBuffer() {
         return outputBuffer;
     }
+    
+    @Override
+    protected Executor getExecutor() {
+        return endpoint.getExecutor();
+    }
 }

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 27e56ad..02ed557 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -21,6 +21,7 @@ import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.nio.channels.SelectionKey;
 import java.util.Locale;
+import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.coyote.ActionCode;
@@ -1027,4 +1028,8 @@ public class Http11NioProcessor extends AbstractHttp11Processor implements Actio
         this.sslSupport = sslSupport;
     }
 
+    @Override
+    protected Executor getExecutor() {
+        return endpoint.getExecutor();
+    }
 }

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 55efad7..22e0873 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -22,6 +22,7 @@ import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.util.Locale;
+import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.coyote.ActionCode;
@@ -838,4 +839,8 @@ public class Http11Processor extends AbstractHttp11Processor implements ActionHo
         outputBuffer.setSocketBuffer(socketBuffer);
     }
 
+    @Override
+    protected Executor getExecutor() {
+        return endpoint.getExecutor();
+    }
 }