Author: markt
Date: Fri May 9 13:21:20 2008
New Revision: 654932
URL: http://svn.apache.org/viewvc?rev=654932&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42934
Trigger contextInitialized() before sessionDidActivate()
TCK tests all pass but I want to give this a little longer in trunk before
proposing it for 6.0.x
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=654932&r1=654931&r2=654932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri May 9
13:21:20 2008
@@ -4269,14 +4269,6 @@
}
- // Start manager
- if ((manager != null) && (manager instanceof Lifecycle)) {
- ((Lifecycle) getManager()).start();
- }
-
- // Start ContainerBackgroundProcessor thread
- super.threadStart();
-
mainOk = true;
}
@@ -4333,13 +4325,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");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
