This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 160b1f67db Rename some parameters. No functional change.
160b1f67db is described below
commit 160b1f67db9fe60ce22835dc3bad2be7f9b2d490
Author: Rainer Jung <[email protected]>
AuthorDate: Thu Apr 27 09:26:36 2023 +0200
Rename some parameters. No functional change.
Instead of "header" (copy-and-pasted) use something more sensible.
---
.../catalina/valves/AbstractAccessLogValve.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index f04ee3f70f..7d923cdb7a 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -1083,8 +1083,8 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
return result.toString();
}
- protected DateAndTimeElement(String header) {
- String format = header;
+ protected DateAndTimeElement(String sdf) {
+ String format = sdf;
boolean usesBegin = false;
FormatType type = FormatType.CLF;
@@ -1560,17 +1560,17 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
* write an attribute in the ServletRequest - %{xxx}r
*/
protected static class RequestAttributeElement implements AccessLogElement
{
- private final String header;
+ private final String attribute;
- public RequestAttributeElement(String header) {
- this.header = header;
+ public RequestAttributeElement(String attribute) {
+ this.attribute = attribute;
}
@Override
public void addElement(CharArrayWriter buf, Date date, Request
request, Response response, long time) {
Object value = null;
if (request != null) {
- value = request.getAttribute(header);
+ value = request.getAttribute(attribute);
} else {
value = "??";
}
@@ -1590,10 +1590,10 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
* write an attribute in the HttpSession - %{xxx}s
*/
protected static class SessionAttributeElement implements AccessLogElement
{
- private final String header;
+ private final String attribute;
- public SessionAttributeElement(String header) {
- this.header = header;
+ public SessionAttributeElement(String attribute) {
+ this.attribute = attribute;
}
@Override
@@ -1602,7 +1602,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
if (null != request) {
HttpSession sess = request.getSession(false);
if (null != sess) {
- value = sess.getAttribute(header);
+ value = sess.getAttribute(attribute);
}
} else {
value = "??";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
