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 00736971B for ; Fri, 2 Mar 2012 12:42:21 +0000 (UTC) Received: (qmail 22243 invoked by uid 500); 2 Mar 2012 12:42:20 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 22176 invoked by uid 500); 2 Mar 2012 12:42:20 -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 22165 invoked by uid 99); 2 Mar 2012 12:42:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 12:42:20 +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; Fri, 02 Mar 2012 12:42:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2CD2B23888E4 for ; Fri, 2 Mar 2012 12:41:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296172 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java http11/Http11Protocol.java Date: Fri, 02 Mar 2012 12:41:54 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302124155.2CD2B23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Mar 2 12:41:54 2012 New Revision: 1296172 URL: http://svn.apache.org/viewvc?rev=1296172&view=rev Log: No need for an upgrade specific poll method. Delete some more code :) Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1296172&r1=1296171&r2=1296172&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Mar 2 12:41:54 2012 @@ -591,7 +591,7 @@ public abstract class AbstractProtocol i release(socket, processor, false, false); } else if (state == SocketState.UPGRADED) { // Need to keep the connection associated with the processor - upgradePoll(socket, processor); + longPoll(socket, processor); } else { // Connection closed. OK to recycle the processor. if (!(processor instanceof UpgradeProcessor)) { @@ -630,8 +630,6 @@ public abstract class AbstractProtocol i Processor processor); protected abstract void longPoll(SocketWrapper socket, Processor processor); - protected abstract void upgradePoll(SocketWrapper socket, - Processor processor); protected abstract void release(SocketWrapper socket, Processor processor, boolean socketClosing, boolean addToPoller); Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1296172&r1=1296171&r2=1296172&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Fri Mar 2 12:41:54 2012 @@ -91,12 +91,6 @@ public abstract class AbstractAjpProtoco } @Override - protected void upgradePoll(SocketWrapper socket, - Processor processor) { - // TODO Should never happen. ISE? - } - - @Override protected P createUpgradeProcessor(SocketWrapper socket, UpgradeInbound inbound) { // TODO should fail - throw IOE Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1296172&r1=1296171&r2=1296172&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Mar 2 12:41:54 2012 @@ -293,22 +293,20 @@ public class Http11AprProtocol extends A connections.put(socket.getSocket(), processor); if (processor.isAsync()) { + // Async socket.setAsync(true); } else if (processor.isComet() && proto.endpoint.isRunning()) { + // Comet ((AprEndpoint) proto.endpoint).getCometPoller().add( socket.getSocket().longValue(), false); + } else { + // Upgraded + ((AprEndpoint) proto.endpoint).getPoller().add( + socket.getSocket().longValue(), false); } } @Override - protected void upgradePoll(SocketWrapper socket, - Processor processor) { - connections.put(socket.getSocket(), processor); - ((AprEndpoint) proto.endpoint).getPoller().add( - socket.getSocket().longValue(), false); - } - - @Override protected Http11AprProcessor createProcessor() { Http11AprProcessor processor = new Http11AprProcessor( proto.getMaxHttpHeaderSize(), (AprEndpoint)proto.endpoint, Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1296172&r1=1296171&r2=1296172&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Mar 2 12:41:54 2012 @@ -249,6 +249,7 @@ public class Http11NioProtocol extends A } else { // Either: // - this is comet request + // - this is an upgraded connection // - the request line/headers have not been completely // read socket.getSocket().getPoller().add(socket.getSocket()); @@ -285,12 +286,5 @@ public class Http11NioProtocol extends A return new UpgradeNioProcessor(socket, inbound, ((Http11NioProtocol) getProtocol()).getEndpoint().getSelectorPool()); } - - @Override - protected void upgradePoll(SocketWrapper socket, - Processor processor) { - connections.put(socket.getSocket(), processor); - socket.getSocket().getPoller().add(socket.getSocket()); - } } } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1296172&r1=1296171&r2=1296172&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Fri Mar 2 12:41:54 2012 @@ -191,11 +191,5 @@ public class Http11Protocol extends Abst throws IOException { return new UpgradeBioProcessor(socket, inbound); } - - @Override - protected void upgradePoll(SocketWrapper socket, - Processor processor) { - connections.put(socket.getSocket(), processor); - } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org