From 71b49610cdfd0d4461517a30cc02f3e88386245f Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 5 Dec 2010 19:16:07 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1042413 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/StandardEngine.java | 35 ++++++++++++++++------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java index 727f63f47..eebb93727 100644 --- a/java/org/apache/catalina/core/StandardEngine.java +++ b/java/org/apache/catalina/core/StandardEngine.java @@ -321,41 +321,54 @@ public class StandardEngine extends ContainerBase implements Engine { } 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); } } -- 2.11.0