Author: fhanik
Date: Fri Oct 6 14:17:02 2006
New Revision: 453769
URL: http://svn.apache.org/viewvc?view=rev&rev=453769
Log:
Must read web.xml before we create the manager, otherwise we don't know if we
need a distributable manager or not.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
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?view=diff&rev=453769&r1=453768&r2=453769
==============================================================================
--- 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 Fri
Oct 6 14:17:02 2006
@@ -4180,25 +4180,6 @@
if (log.isDebugEnabled())
log.debug("Processing standard container startup");
- // Acquire clustered manager
- Manager contextManager = null;
- if (manager == null) {
- if ((getCluster() != null) && distributable) {
- try {
- contextManager =
getCluster().createManager(getName());
- } catch (Exception ex) {
- log.error("standardContext.clusterFail", ex);
- ok = false;
- }
- } else {
- contextManager = new StandardManager();
- }
- } else if ((getCluster() != null) && distributable) {
- //let the cluster know that there is a context that is
distributable
- //and that it has its own manager
- getCluster().registerManager(manager);
- }
-
// Binding thread
ClassLoader oldCCL = bindThread();
@@ -4254,6 +4235,25 @@
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(START_EVENT, null);
+
+ // Acquire clustered manager
+ Manager contextManager = null;
+ if (manager == null) {
+ if ( (getCluster() != null) && distributable) {
+ try {
+ contextManager =
getCluster().createManager(getName());
+ } catch (Exception ex) {
+ log.error("standardContext.clusterFail", ex);
+ ok = false;
+ }
+ } else {
+ contextManager = new StandardManager();
+ }
+ } else if ( (getCluster() != null) && distributable) {
+ //let the cluster know that there is a context that is
distributable
+ //and that it has its own manager
+ getCluster().registerManager(manager);
+ }
// Configure default manager if none was specified
if (contextManager != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
