You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/06/08 14:49:51 UTC
svn commit: r664494 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
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)
</fix>
<fix>
+ <bug>42934</bug>: Change the order of events on context start so
+ <code>contextInitialized()</code> event is fired before
+ <code>sessionDidActivate()</code>. The spec isn't 100% clear on the
+ required order but this seems more logical than the current behaviour.
+ (markt)
+ </fix>
+ <fix>
<bug>43079</bug>: Fix identification of suspicious URL patterns. Patch
provided by John Kew. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org