Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E69BA40D3 for ; Sun, 19 Jun 2011 15:56:47 +0000 (UTC) Received: (qmail 61355 invoked by uid 500); 19 Jun 2011 15:56:47 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 61274 invoked by uid 500); 19 Jun 2011 15:56:47 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 61265 invoked by uid 99); 19 Jun 2011 15:56:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jun 2011 15:56:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jun 2011 15:56:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3100C23889E1; Sun, 19 Jun 2011 15:56:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1137382 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java ajp/AbstractAjpProcessor.java http11/AbstractHttp11Processor.java Date: Sun, 19 Jun 2011 15:56:23 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110619155623.3100C23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Jun 19 15:56:22 2011 New Revision: 1137382 URL: http://svn.apache.org/viewvc?rev=1137382&view=rev Log: Pull up common 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/http11/AbstractHttp11Processor.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=1137382&r1=1137381&r2=1137382&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Sun Jun 19 15:56:22 2011 @@ -19,6 +19,7 @@ package org.apache.coyote; import java.util.concurrent.Executor; import org.apache.tomcat.util.net.AbstractEndpoint; +import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; /** * Provides functionality and attributes common to all supported protocols @@ -82,11 +83,6 @@ public abstract class AbstractProcessor } - - /* - * Expose selected endpoint attributes through the processor - */ - /** * Obtain the Executor used by the underlying endpoint. */ @@ -94,4 +90,14 @@ public abstract class AbstractProcessor public Executor getExecutor() { return endpoint.getExecutor(); } + + + public boolean isAsync() { + return asyncStateMachine.isAsync(); + } + + + public SocketState asyncPostProcess() { + return asyncStateMachine.asyncPostProcess(); + } } 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=1137382&r1=1137381&r2=1137382&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Sun Jun 19 15:56:22 2011 @@ -871,14 +871,6 @@ public abstract class AbstractAjpProcess throws IOException; - protected boolean isAsync() { - return asyncStateMachine.isAsync(); - } - - protected SocketState asyncPostProcess() { - return asyncStateMachine.asyncPostProcess(); - } - // ------------------------------------- InputStreamInputBuffer Inner Class 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=1137382&r1=1137381&r2=1137382&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sun Jun 19 15:56:22 2011 @@ -42,7 +42,6 @@ import org.apache.tomcat.util.buf.Messag import org.apache.tomcat.util.http.FastHttpDateFormat; import org.apache.tomcat.util.http.MimeHeaders; import org.apache.tomcat.util.net.AbstractEndpoint; -import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.res.StringManager; public abstract class AbstractHttp11Processor extends AbstractProcessor { @@ -1023,12 +1022,4 @@ public abstract class AbstractHttp11Proc } protected abstract void recycleInternal(); - - protected boolean isAsync() { - return asyncStateMachine.isAsync(); - } - - protected SocketState asyncPostProcess() { - return asyncStateMachine.asyncPostProcess(); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org