This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8a39aa99dd Re-apply standard formatting. No functional change.
8a39aa99dd is described below
commit 8a39aa99dd570a2a0ec492db9d93e1a89e4ae2d8
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 21 10:58:00 2025 +0000
Re-apply standard formatting. No functional change.
Mainly committed because I needed to test the BuildBot CI
---
java/org/apache/catalina/util/ParameterMap.java | 4 ++--
java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 3 +--
java/org/apache/catalina/valves/rewrite/RewriteValve.java | 2 +-
3 files changed, 4 insertions(+), 5 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 c031bedb9e..a0c70a499d 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -716,8 +716,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
return (buf, request, res, l) ->
wrap(request.getRequestedSessionId(), buf);
}
case "requestedSessionIdFromCookie" -> {
- return (buf, request, res, l) ->
wrap(String.valueOf(request.isRequestedSessionIdFromCookie()),
- buf);
+ return (buf, request, res, l) ->
wrap(String.valueOf(request.isRequestedSessionIdFromCookie()), buf);
}
case "requestedSessionIdValid" -> {
return (buf, request, res, l) ->
wrap(String.valueOf(request.isRequestedSessionIdValid()), buf);
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 328f78d431..0f4598f325 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -568,7 +568,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]
