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 DBA87994C for ; Wed, 1 Feb 2012 19:44:26 +0000 (UTC) Received: (qmail 99962 invoked by uid 500); 1 Feb 2012 19:44:26 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 99853 invoked by uid 500); 1 Feb 2012 19:44:25 -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 99840 invoked by uid 99); 1 Feb 2012 19:44:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 19:44:24 +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, 01 Feb 2012 19:44:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D94AB238890D for ; Wed, 1 Feb 2012 19:44:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239285 - in /tomcat/trunk/java/org/apache: catalina/Globals.java catalina/connector/Request.java catalina/core/StandardWrapperValve.java coyote/Constants.java coyote/http11/AbstractHttp11Processor.java Date: Wed, 01 Feb 2012 19:44:00 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120201194400.D94AB238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Feb 1 19:44:00 2012 New Revision: 1239285 URL: http://svn.apache.org/viewvc?rev=1239285&view=rev Log: Start to hook up unused constants Modified: tomcat/trunk/java/org/apache/catalina/Globals.java tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java tomcat/trunk/java/org/apache/coyote/Constants.java tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Modified: tomcat/trunk/java/org/apache/catalina/Globals.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1239285&r1=1239284&r2=1239285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/Globals.java (original) +++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Feb 1 19:44:00 2012 @@ -142,9 +142,10 @@ public final class Globals { /** * The request attribute that is set to the value of {@code Boolean.TRUE} * if connector processing this request supports Comet API. + * Duplicated here for neater code in the catalina packages. */ public static final String COMET_SUPPORTED_ATTR = - "org.apache.tomcat.comet.support"; + org.apache.coyote.Constants.COMET_SUPPORTED_ATTR; /** Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1239285&r1=1239284&r2=1239285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Feb 1 19:44:00 2012 @@ -943,7 +943,7 @@ public class Request * have names starting with "org.apache.tomcat" and include: *
    *
  • org.apache.tomcat.sendfile.support
    • - *
  • org.apache.tomcat.comet.support
    • + *
  • {@link Globals#COMET_SUPPORTED_ATTR
    • *
  • org.apache.tomcat.comet.timeout.support
    • *
* Connector implementations may return some, all or none of these Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1239285&r1=1239284&r2=1239285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Wed Feb 1 19:44:00 2012 @@ -29,6 +29,7 @@ import javax.servlet.UnavailableExceptio import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Context; +import org.apache.catalina.Globals; import org.apache.catalina.LifecycleException; import org.apache.catalina.comet.CometEvent; import org.apache.catalina.comet.CometProcessor; @@ -165,8 +166,8 @@ final class StandardWrapperValve // Identify if the request is Comet related now that the servlet has been allocated boolean comet = false; - if (servlet instanceof CometProcessor - && request.getAttribute("org.apache.tomcat.comet.support") == Boolean.TRUE) { + if (servlet instanceof CometProcessor && request.getAttribute( + Globals.COMET_SUPPORTED_ATTR) == Boolean.TRUE) { comet = true; request.setComet(true); } Modified: tomcat/trunk/java/org/apache/coyote/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Constants.java?rev=1239285&r1=1239284&r2=1239285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/Constants.java (original) +++ tomcat/trunk/java/org/apache/coyote/Constants.java Wed Feb 1 19:44:00 2012 @@ -59,4 +59,12 @@ public final class Constants { Boolean.valueOf(System.getProperty( "org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER", "false")).booleanValue(); + + /** + * The request attribute that is set to the value of {@code Boolean.TRUE} + * if connector processing this request supports Comet API. + */ + public static final String COMET_SUPPORTED_ATTR = + "org.apache.tomcat.comet.support"; + } 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=1239285&r1=1239284&r2=1239285&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed Feb 1 19:44:00 2012 @@ -1279,7 +1279,8 @@ public abstract class AbstractHttp11Proc // Advertise comet support through a request attribute if (endpoint.getUseComet()) { - request.setAttribute("org.apache.tomcat.comet.support", + request.setAttribute( + org.apache.coyote.Constants.COMET_SUPPORTED_ATTR, Boolean.TRUE); } // Advertise comet timeout support --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org