This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new d243012c04 Refactor. Simplify. escapeAndAppend() includes null handling
d243012c04 is described below
commit d243012c041efb4aea90b9faca9feb99494cda34
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Apr 1 11:06:29 2026 +0100
Refactor. Simplify. escapeAndAppend() includes null handling
---
java/org/apache/catalina/valves/AbstractAccessLogValve.java | 7 +------
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index bf568dab61..1c1bc1b707 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -962,12 +962,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
@Override
public void addElement(CharArrayWriter buf, Request request, Response
response, long time) {
if (request != null) {
- String value = request.getRemoteUser();
- if (value != null) {
- escapeAndAppend(value, buf);
- } else {
- buf.append('-');
- }
+ escapeAndAppend(request.getRemoteUser(), buf);
} else {
buf.append('-');
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 30f20a2818..b49ff5d76c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 11.0.22 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <scode>
+ Refactor generation of the remote user element in the access log to
+ remove unnecessary code. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 11.0.21 (markt)" rtext="in development">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
