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 2010/11/23 23:48:22 UTC
svn commit: r1038369 - in /tomcat/trunk/java/org/apache/catalina/core:
ContainerBase.java StandardEngine.java
Author: markt
Date: Tue Nov 23 22:48:21 2010
New Revision: 1038369
URL: http://svn.apache.org/viewvc?rev=1038369&view=rev
Log:
NoOp logger is only used in StandardEngine so move it there
Only log to containers that are available
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.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=1038369&r1=1038368&r2=1038369&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue Nov 23 22:48:21 2010
@@ -1404,14 +1404,5 @@ public abstract class ContainerBase exte
}
}
}
-
- }
-
- protected static final class NoopAccessLog implements AccessLog {
-
- @Override
- public void log(Request request, Response response, long time) {
- // NOOP
- }
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038369&r1=1038368&r2=1038369&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Tue Nov 23 22:48:21 2010
@@ -317,13 +317,14 @@ public class StandardEngine extends Cont
// If we reached this point, this Engine can't have an AccessLog
// Look in the defaultHost
Host host = (Host) findChild(getDefaultHost());
- if (host != null) {
+ if (host != null && host.getState().isAvailable()) {
defaultAccessLog = host.getAccessLog();
if (defaultAccessLog == null) {
// Try the ROOT context of default host
Context context = (Context) host.findChild("");
- if (context != null) {
+ if (context != null &&
+ context.getState().isAvailable()) {
defaultAccessLog = context.getAccessLog();
}
}
@@ -359,4 +360,12 @@ public class StandardEngine extends Cont
return "type=Engine";
}
+ // ----------------------------------------------------------- Inner classes
+ protected static final class NoopAccessLog implements AccessLog {
+
+ @Override
+ public void log(Request request, Response response, long time) {
+ // NOOP
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org