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 008EB44B7 for ; Wed, 15 Jun 2011 15:44:18 +0000 (UTC) Received: (qmail 36210 invoked by uid 500); 15 Jun 2011 15:44:17 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 36142 invoked by uid 500); 15 Jun 2011 15:44:17 -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 36133 invoked by uid 99); 15 Jun 2011 15:44:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jun 2011 15:44:17 +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; Wed, 15 Jun 2011 15:44:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C445B23889DA; Wed, 15 Jun 2011 15:43:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1136090 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpAprProtocol.java Date: Wed, 15 Jun 2011 15:43:53 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110615154353.C445B23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Jun 15 15:43:53 2011 New Revision: 1136090 URL: http://svn.apache.org/viewvc?rev=1136090&view=rev Log: Align code between connectors in preparation for pulling code up to the superclass No need to pass the socket into the asyncDispatch() call. It will always have been set beforehand. Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 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=1136090&r1=1136089&r2=1136090&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Jun 15 15:43:53 2011 @@ -333,11 +333,7 @@ public class AjpAprProcessor extends Abs } - public SocketState asyncDispatch(SocketWrapper socket, - SocketStatus status) { - - // Setting up the socket - this.socket = socket; + public SocketState asyncDispatch(SocketStatus status) { RequestInfo rp = request.getRequestProcessor(); try { Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1136090&r1=1136089&r2=1136090&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Jun 15 15:43:53 2011 @@ -192,7 +192,7 @@ public class AjpAprProtocol extends Abst if (processor != null) { // Call the appropriate event try { - state = processor.asyncDispatch(socket, status); + state = processor.asyncDispatch(status); } // Future developers: if you discover any other // rare-but-nonfatal exceptions, catch them here, and log as --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org