Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 63214 invoked from network); 8 Jun 2008 12:50:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Jun 2008 12:50:21 -0000 Received: (qmail 77464 invoked by uid 500); 8 Jun 2008 12:50:17 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 77415 invoked by uid 500); 8 Jun 2008 12:50: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 77404 invoked by uid 500); 8 Jun 2008 12:50:17 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 77401 invoked by uid 99); 8 Jun 2008 12:50:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jun 2008 05:50:17 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 08 Jun 2008 12:49:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 647FD23889F7; Sun, 8 Jun 2008 05:49:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r664494 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml Date: Sun, 08 Jun 2008 12:49:51 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080608124951.647FD23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Jun 8 05:49:50 2008 New Revision: 664494 URL: http://svn.apache.org/viewvc?rev=664494&view=rev Log: Fix 42934. Change the order of events on context start so contextInitialized() event is fired before sessionDidActivate(). The spec isn't 100% clear on the required order but this seems more logical than the current behaviour. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=664494&r1=664493&r2=664494&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 8 05:49:50 2008 @@ -88,14 +88,6 @@ +1: markt, remm (but there's downside as naming now depends on the utils) -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42934 - Change the order of events on context start so contextInitialized() event is - fired before sessionDidActivate(). The spec isn't 100% clear on the required - order but this seems more logical than the current behaviour. - http://svn.apache.org/viewvc?rev=654932&view=rev - +1: markt, remm, pero - -1: - * Enhancement https://issues.apache.org/bugzilla/show_bug.cgi?id=45155 Provide a workaround to a buggy MS WebDAV client. http://svn.apache.org/viewvc?rev=664345&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=664494&r1=664493&r2=664494&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun Jun 8 05:49:50 2008 @@ -4278,14 +4278,6 @@ } - // Start manager - if ((manager != null) && (manager instanceof Lifecycle)) { - ((Lifecycle) getManager()).start(); - } - - // Start ContainerBackgroundProcessor thread - super.threadStart(); - mainOk = true; } @@ -4345,13 +4337,28 @@ lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null); } - // Configure and call application event listeners and filters + // Configure and call application event listeners if (ok) { if (!listenerStart()) { log.error( "Error listenerStart"); ok = false; } } + + try { + // Start manager + if ((manager != null) && (manager instanceof Lifecycle)) { + ((Lifecycle) getManager()).start(); + } + + // Start ContainerBackgroundProcessor thread + super.threadStart(); + } catch(Exception e) { + log.error("Error manager.start()", e); + ok = false; + } + + // Configure and call application filters if (ok) { if (!filterStart()) { log.error( "Error filterStart"); Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=664494&r1=664493&r2=664494&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jun 8 05:49:50 2008 @@ -50,6 +50,13 @@ using the webapp class loader when we create them. (markt) + 42934: Change the order of events on context start so + contextInitialized() event is fired before + sessionDidActivate(). The spec isn't 100% clear on the + required order but this seems more logical than the current behaviour. + (markt) + + 43079: Fix identification of suspicious URL patterns. Patch provided by John Kew. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org