Author: markt
Date: Sun Dec 5 19:16:07 2010
New Revision: 1042413
URL: http://svn.apache.org/viewvc?rev=1042413&view=rev
Log:
Address some review comments:
1. Avoid possible NPEs by using a local variable for the newDefaultAccessLog
2. PropertyChangeListener should be added to the Engine
3. Add the listener when the Noop logger is used so changes can be detected
that could cause a different logger to be used.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
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=1042413&r1=1042412&r2=1042413&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Sun Dec 5
19:16:07 2010
@@ -321,41 +321,54 @@ public class StandardEngine extends Cont
}
if (!logged && useDefault) {
- if (defaultAccessLog == null) {
+ AccessLog newDefaultAccessLog = defaultAccessLog;
+ if (newDefaultAccessLog == null) {
// If we reached this point, this Engine can't have an
AccessLog
// Look in the defaultHost
Host host = (Host) findChild(getDefaultHost());
+ Context context = null;
if (host != null && host.getState().isAvailable()) {
- defaultAccessLog = host.getAccessLog();
+ newDefaultAccessLog = host.getAccessLog();
- if (defaultAccessLog != null) {
+ if (newDefaultAccessLog != null) {
AccessLogListener l = new AccessLogListener(this);
- host.addPropertyChangeListener(l);
+ this.addPropertyChangeListener(l);
host.addContainerListener(l);
host.addLifecycleListener(l);
} else {
// Try the ROOT context of default host
- Context context = (Context) host.findChild("");
+ context = (Context) host.findChild("");
if (context != null &&
context.getState().isAvailable()) {
- defaultAccessLog = context.getAccessLog();
+ newDefaultAccessLog = context.getAccessLog();
- if (defaultAccessLog != null) {
+ if (newDefaultAccessLog != null) {
AccessLogListener l =
new AccessLogListener(this);
- context.addPropertyChangeListener(l);
+ this.addPropertyChangeListener(l);
context.addLifecycleListener(l);
}
}
}
}
- if (defaultAccessLog == null) {
- defaultAccessLog = new NoopAccessLog();
+ if (newDefaultAccessLog == null) {
+ newDefaultAccessLog = new NoopAccessLog();
+ AccessLogListener l = new AccessLogListener(this);
+ this.addPropertyChangeListener(l);
+ if (host != null) {
+ host.addContainerListener(l);
+ host.addLifecycleListener(l);
+ }
+ if (context != null) {
+ context.addLifecycleListener(l);
+ }
+
}
+ defaultAccessLog = newDefaultAccessLog;
}
- defaultAccessLog.log(request, response, time);
+ newDefaultAccessLog.log(request, response, time);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
