Author: markt
Date: Tue Sep 14 12:09:50 2010
New Revision: 996861
URL: http://svn.apache.org/viewvc?rev=996861&view=rev
Log:
More re-factoring: expose the Executor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=996861&r1=996860&r2=996861&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue
Sep 14 12:09:50 2010
@@ -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 AbstractHttp11Proc
}
protected abstract void recycleInternal();
+
+ protected abstract Executor getExecutor();
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=996861&r1=996860&r2=996861&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Sep
14 12:09:50 2010
@@ -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
protected AbstractOutputBuffer getOutputBuffer() {
return outputBuffer;
}
+
+ @Override
+ protected Executor getExecutor() {
+ return endpoint.getExecutor();
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=996861&r1=996860&r2=996861&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Sep
14 12:09:50 2010
@@ -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
this.sslSupport = sslSupport;
}
+ @Override
+ protected Executor getExecutor() {
+ return endpoint.getExecutor();
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=996861&r1=996860&r2=996861&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 14
12:09:50 2010
@@ -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 Abs
outputBuffer.setSocketBuffer(socketBuffer);
}
+ @Override
+ protected Executor getExecutor() {
+ return endpoint.getExecutor();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
