Author: markt
Date: Sat Jun 4 21:00:07 2011
New Revision: 1131494
URL: http://svn.apache.org/viewvc?rev=1131494&view=rev
Log:
Pull up common getExecutor code
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
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/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Sat Jun 4
21:00:07 2011
@@ -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
protected AbstractEndpoint getEndpoint() {
return endpoint;
}
+
+ @Override
+ public Executor getExecutor() {
+ return endpoint.getExecutor();
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Sat Jun
4 21:00:07 2011
@@ -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 AbstractAjpProcess
protected abstract void finish() throws IOException;
- @Override
- public abstract Executor getExecutor();
-
-
public void recycle() {
asyncStateMachine.recycle();
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sat Jun 4
21:00:07 2011
@@ -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 Abs
}
- @Override
- public Executor getExecutor() {
- return endpoint.getExecutor();
- }
-
-
// ----------------------------------------------------- ActionHook Methods
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sat Jun 4
21:00:07 2011
@@ -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 Abs
}
- @Override
- public Executor getExecutor() {
- return endpoint.getExecutor();
- }
-
-
// ----------------------------------------------------- ActionHook Methods
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sat Jun 4
21:00:07 2011
@@ -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 Abstra
}
- @Override
- public Executor getExecutor() {
- return endpoint.getExecutor();
- }
-
-
// ----------------------------------------------------- ActionHook Methods
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=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sat
Jun 4 21:00:07 2011
@@ -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 AbstractHttp11Proc
protected abstract void recycleInternal();
- @Override
- public abstract Executor getExecutor();
-
protected boolean isAsync() {
return asyncStateMachine.isAsync();
}
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=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sat Jun
4 21:00:07 2011
@@ -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
protected AbstractOutputBuffer getOutputBuffer() {
return outputBuffer;
}
-
- @Override
- public 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=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sat Jun
4 21:00:07 2011
@@ -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
public void setSslSupport(SSLSupport sslSupport) {
this.sslSupport = sslSupport;
}
-
- @Override
- public 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=1131494&r1=1131493&r2=1131494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sat Jun 4
21:00:07 2011
@@ -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 Abs
super.setSocketBuffer(socketBuffer);
outputBuffer.setSocketBuffer(socketBuffer);
}
-
- @Override
- public Executor getExecutor() {
- return endpoint.getExecutor();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
