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 8bf18b61f7 Re-apply standard formatting. No functional change.
8bf18b61f7 is described below
commit 8bf18b61f7a749a86919988af3c80622f8d37ad0
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 21 14:14:52 2025 +0000
Re-apply standard formatting. No functional change.
Mainly committed because I need to test the BuildBot CI
---
java/org/apache/catalina/util/ParameterMap.java | 4 ++--
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 9 +++------
java/org/apache/catalina/valves/rewrite/RewriteValve.java | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/util/ParameterMap.java
b/java/org/apache/catalina/util/ParameterMap.java
index b2d5252887..a519c7b847 100644
--- a/java/org/apache/catalina/util/ParameterMap.java
+++ b/java/org/apache/catalina/util/ParameterMap.java
@@ -85,7 +85,7 @@ public final class ParameterMap<K, V> implements Map<K,V>,
Serializable {
// Unroll loop for performance -
https://bz.apache.org/bugzilla/show_bug.cgi?id=69820
int mapSize = map.size();
delegatedMap = new LinkedHashMap<>((int) (mapSize * 1.5));
- for (Map.Entry<K, V> entry : map.entrySet()) {
+ for (Map.Entry<K,V> entry : map.entrySet()) {
delegatedMap.put(entry.getKey(), entry.getValue());
}
unmodifiableDelegatedMap = Collections.unmodifiableMap(delegatedMap);
@@ -103,7 +103,7 @@ public final class ParameterMap<K, V> implements Map<K,V>,
Serializable {
// Unroll loop for performance -
https://bz.apache.org/bugzilla/show_bug.cgi?id=69820
int mapSize = map.size();
delegatedMap = new LinkedHashMap<>((int) (mapSize * 1.5));
- for (Map.Entry<K, V> entry : map.entrySet()) {
+ for (Map.Entry<K,V> entry : map.entrySet()) {
delegatedMap.put(entry.getKey(), entry.getValue());
}
unmodifiableDelegatedMap = Collections.unmodifiableMap(delegatedMap);
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index c53a5c1efb..9409772aac 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -549,8 +549,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
} else if ("dns".equals(nextToken)) {
return new AccessLogElement() {
@Override
- public void addElement(CharArrayWriter buf, Request
request, Response response,
- long time) {
+ public void addElement(CharArrayWriter buf, Request
request, Response response, long time) {
String value;
try {
value = InetAddress.getLocalHost().getHostName();
@@ -588,8 +587,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
} else if ("query".equals(token)) {
return new AccessLogElement() {
@Override
- public void addElement(CharArrayWriter buf,
Request request, Response response,
- long time) {
+ public void addElement(CharArrayWriter buf,
Request request, Response response, long time) {
String query = request.getQueryString();
if (query != null) {
buf.append(query);
@@ -602,8 +600,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
} else {
return new AccessLogElement() {
@Override
- public void addElement(CharArrayWriter buf, Request
request, Response response,
- long time) {
+ public void addElement(CharArrayWriter buf, Request
request, Response response, long time) {
String query = request.getQueryString();
buf.append(request.getRequestURI());
if (query != null) {
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 3662110bae..4c47d3f9eb 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -569,7 +569,7 @@ public class RewriteValve extends ValveBase {
chunk.append(urlStringRewriteDecoded);
// Set the new Query String
if (queryStringRewriteEncoded == null) {
- // No new query string. Therefore the original is
retained unless QSD is defined.
+ // No new query string. Therefore the original is
retained unless QSD is defined.
if (qsd) {
request.getCoyoteRequest().queryString().setChars(MessageBytes.EMPTY_CHAR_ARRAY,
0, 0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
