You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2016/11/17 12:57:01 UTC

svn commit: r1770180 - in /tomcat/trunk: java/org/apache/catalina/AccessLog.java java/org/apache/catalina/valves/AbstractAccessLogValve.java java/org/apache/catalina/valves/JDBCAccessLogValve.java webapps/docs/changelog.xml

Author: violetagg
Date: Thu Nov 17 12:57:01 2016
New Revision: 1770180

URL: http://svn.apache.org/viewvc?rev=1770180&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60387
Correct the javadoc for o.a.catalina.AccessLog.setRequestAttributesEnabled

Modified:
    tomcat/trunk/java/org/apache/catalina/AccessLog.java
    tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
    tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/AccessLog.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/AccessLog.java?rev=1770180&r1=1770179&r2=1770180&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/AccessLog.java (original)
+++ tomcat/trunk/java/org/apache/catalina/AccessLog.java Thu Nov 17 12:57:01 2016
@@ -74,11 +74,10 @@ public interface AccessLog {
     public void log(Request request, Response response, long time);
 
     /**
-     * Should this valve set request attributes for IP address, Hostname,
+     * 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.
-     * Default is <code>true</code>.
      *
      * The attributes set are:
      * <ul>

Modified: tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1770180&r1=1770179&r2=1770180&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java Thu Nov 17 12:57:01 2016
@@ -437,6 +437,9 @@ public abstract class AbstractAccessLogV
     protected AccessLogElement[] logElements = null;
 
     /**
+     * Should this valve set request attributes for IP address, hostname,
+     * protocol and port used for the request.
+     * Default is <code>false</code>.
      * @see #setRequestAttributesEnabled(boolean)
      */
     protected boolean requestAttributesEnabled = false;
@@ -460,6 +463,7 @@ public abstract class AbstractAccessLogV
 
     /**
      * {@inheritDoc}
+     * Default is <code>false</code>.
      */
     @Override
     public void setRequestAttributesEnabled(boolean requestAttributesEnabled) {

Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1770180&r1=1770179&r2=1770180&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Thu Nov 17 12:57:01 2016
@@ -208,6 +208,9 @@ public final class JDBCAccessLogValve ex
     private long currentTimeMillis;
 
     /**
+     * Should this valve set request attributes for IP address, hostname,
+     * protocol and port used for the request.
+     * Default is <code>true</code>.
      * @see #setRequestAttributesEnabled(boolean)
      */
     boolean requestAttributesEnabled = true;
@@ -217,6 +220,7 @@ public final class JDBCAccessLogValve ex
 
     /**
      * {@inheritDoc}
+     * Default is <code>true</code>.
      */
     @Override
     public void setRequestAttributesEnabled(boolean requestAttributesEnabled) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1770180&r1=1770179&r2=1770180&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 17 12:57:01 2016
@@ -74,6 +74,12 @@
         <bug>60368</bug>: Stop creating a default connector on start in
         embedded mode. (remm)
       </update>
+      <fix>
+        <bug>60387</bug>: Correct the javadoc for
+        <code>o.a.catalina.AccessLog.setRequestAttributesEnabled</code>.
+        The default value is different for the different implementations.
+        (violetagg)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org