Author: remm
Date: Sat Feb 4 09:36:19 2006
New Revision: 374893
URL: http://svn.apache.org/viewcvs?rev=374893&view=rev
Log:
- It is always possible that container loggers are acquired before the
classloader is correctly
setup. Set it to null to ensure the correct classloader will be used the rest
of the way.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java?rev=374893&r1=374892&r2=374893&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Sat Feb 4 09:36:19 2006
@@ -993,6 +993,7 @@
// Start our subordinate components, if any
if ((loader != null) && (loader instanceof Lifecycle))
((Lifecycle) loader).start();
+ logger = null;
getLogger();
if ((logger != null) && (logger instanceof Lifecycle))
((Lifecycle) logger).start();
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=374893&r1=374892&r2=374893&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Sat Feb 4 09:36:19 2006
@@ -4082,8 +4082,13 @@
// Binding thread
oldCCL = bindThread();
+ // Initialize logger again. Other components might have used
it too early,
+ // so it should be reset.
+ logger = null;
+ getLogger();
if ((logger != null) && (logger instanceof Lifecycle))
((Lifecycle) logger).start();
+
if ((cluster != null) && (cluster instanceof Lifecycle))
((Lifecycle) cluster).start();
if ((realm != null) && (realm instanceof Lifecycle))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
