From 631e6a6c15aa007f8dd7bf9065de1c572c420a16 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 4 Jun 2011 21:00:07 +0000 Subject: [PATCH] Pull up common getExecutor code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1131494 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/AbstractProcessor.java | 7 +++++++ java/org/apache/coyote/ajp/AbstractAjpProcessor.java | 5 ----- java/org/apache/coyote/ajp/AjpAprProcessor.java | 7 ------- java/org/apache/coyote/ajp/AjpNioProcessor.java | 7 ------- java/org/apache/coyote/ajp/AjpProcessor.java | 7 ------- java/org/apache/coyote/http11/AbstractHttp11Processor.java | 4 ---- java/org/apache/coyote/http11/Http11AprProcessor.java | 6 ------ java/org/apache/coyote/http11/Http11NioProcessor.java | 6 ------ java/org/apache/coyote/http11/Http11Processor.java | 6 ------ 9 files changed, 7 insertions(+), 48 deletions(-) diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java index 20d29c8e7..7cc47f341 100644 --- 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 7c69da373..ea3306bc8 100644 --- 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 434b2f242..783d54a36 100644 --- 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 8f0396fc1..4027d91be 100644 --- 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 207fe695e..18009290c 100644 --- 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 59fb42482..52a6da475 100644 --- 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 60358e648..f4e984958 100644 --- 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 273d51486..43be314fb 100644 --- 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 f14c8c291..dfd70eaa3 100644 --- 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(); - } } -- 2.11.0