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 2012/01/12 21:33:45 UTC
svn commit: r1230763 - in /tomcat/trunk/java/org/apache/catalina/core:
ContainerBase.java StandardContext.java
Author: markt
Date: Thu Jan 12 20:33:45 2012
New Revision: 1230763
URL: http://svn.apache.org/viewvc?rev=1230763&view=rev
Log:
Logger will not implement Lifecycle. This was a leftover from the
pre-JULI logger implementation.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1230763&r1=1230762&r2=1230763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Jan 12 20:33:45 2012
@@ -1085,8 +1085,6 @@ public abstract class ContainerBase exte
((Lifecycle) loader).start();
logger = null;
getLogger();
- if ((logger != null) && (logger instanceof Lifecycle))
- ((Lifecycle) logger).start();
if ((manager != null) && (manager instanceof Lifecycle))
((Lifecycle) manager).start();
if ((cluster != null) && (cluster instanceof Lifecycle))
@@ -1189,9 +1187,6 @@ public abstract class ContainerBase exte
((Lifecycle) manager).getState().isAvailable() ) {
((Lifecycle) manager).stop();
}
- if ((logger != null) && (logger instanceof Lifecycle)) {
- ((Lifecycle) logger).stop();
- }
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
}
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=1230763&r1=1230762&r2=1230763&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 12 20:33:45 2012
@@ -5037,12 +5037,10 @@ public class StandardContext extends Con
unbindThread(oldCCL);
oldCCL = bindThread();
- // Initialize logger again. Other components might have used it too early,
- // so it should be reset.
+ // 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();
@@ -5400,9 +5398,6 @@ public class StandardContext extends Con
if ((cluster != null) && (cluster instanceof Lifecycle)) {
((Lifecycle) cluster).stop();
}
- if ((logger != null) && (logger instanceof Lifecycle)) {
- ((Lifecycle) logger).stop();
- }
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
}
@@ -5465,9 +5460,6 @@ public class StandardContext extends Con
if ((cluster != null) && (cluster instanceof Lifecycle)) {
((Lifecycle) cluster).destroy();
}
- if ((logger != null) && (logger instanceof Lifecycle)) {
- ((Lifecycle) logger).destroy();
- }
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).destroy();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org