This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 5dbaead Fix copy/paste issues in Javadoc
5dbaead is described below
commit 5dbaead9d829581470202c1faef2ac38517872c9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 4 08:17:19 2020 +0000
Fix copy/paste issues in Javadoc
---
java/org/apache/catalina/AccessLog.java | 13 ++++++-------
java/org/apache/catalina/valves/AccessLogValve.java | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/AccessLog.java
b/java/org/apache/catalina/AccessLog.java
index 7e6f28d..138f9f4 100644
--- a/java/org/apache/catalina/AccessLog.java
+++ b/java/org/apache/catalina/AccessLog.java
@@ -81,22 +81,21 @@ public interface AccessLog {
public void log(Request request, Response response, long time);
/**
- * Should this valve set request attributes for IP address, hostname,
- * protocol and port used for the request? This are typically used in
- * conjunction with the {@link org.apache.catalina.valves.AccessLogValve}
- * which will otherwise log the original values.
+ * Should this valve use request attributes for IP address, hostname,
+ * protocol and port used for the request?
*
- * The attributes set are:
+ * The attributes used are:
* <ul>
* <li>org.apache.catalina.RemoteAddr</li>
* <li>org.apache.catalina.RemoteHost</li>
* <li>org.apache.catalina.Protocol</li>
+ * <li>org.apache.catalina.ServerName</li>
* <li>org.apache.catalina.ServerPost</li>
* </ul>
*
* @param requestAttributesEnabled <code>true</code> causes the attributes
- * to be set, <code>false</code> disables
- * the setting of the attributes.
+ * to be used, <code>false</code> causes
+ * the original values to be used.
*/
public void setRequestAttributesEnabled(boolean requestAttributesEnabled);
diff --git a/java/org/apache/catalina/valves/AccessLogValve.java
b/java/org/apache/catalina/valves/AccessLogValve.java
index d33f622..6dba9f1 100644
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -563,7 +563,7 @@ public class AccessLogValve extends ValveBase implements
AccessLog {
protected AccessLogElement[] logElements = null;
/**
- * Should this valve set request attributes for IP address, hostname,
+ * Should this valve use request attributes for IP address, hostname,
* protocol and port used for the request.
* Default is <code>false</code>.
* @see #setRequestAttributesEnabled(boolean)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
