(tomcat) branch main updated: Code clean-up - formatting. No functional change.

[markt]

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 b583940405 Code clean-up  - formatting. No functional change.
b583940405 is described below

commit b583940405e9a8350f5ece816c7684de3a0dd492
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 31 13:51:09 2025 +0100

    Code clean-up  - formatting. No functional change.
---
 .../org/apache/coyote/ajp/AbstractAjpProtocol.java |  4 ++--
 java/org/apache/coyote/ajp/AjpProcessor.java       | 27 +++++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index d6b8412b76..f1e517f1a1 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -241,8 +241,8 @@ public abstract class AbstractAjpProtocol<S> extends 
AbstractProtocol<S> {
 
     @Override
     protected Processor createUpgradeProcessor(SocketWrapperBase<?> socket, 
UpgradeToken upgradeToken) {
-        throw new 
IllegalStateException(sm.getString("ajpprotocol.noUpgradeHandler",
-                upgradeToken.httpUpgradeHandler().getClass().getName()));
+        throw new IllegalStateException(
+                sm.getString("ajpprotocol.noUpgradeHandler", 
upgradeToken.httpUpgradeHandler().getClass().getName()));
     }
 
 
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java 
b/java/org/apache/coyote/ajp/AjpProcessor.java
index 172e96437b..2fe3c5a7ea 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -128,20 +128,19 @@ public class AjpProcessor extends AbstractProcessor {
         System.arraycopy(pongMessage.getBuffer(), 0, pongMessageArray, 0, 
pongMessage.getLen());
 
         // Build Map of Java Servlet to Jakarta Servlet attribute names
-        jakartaAttributeMapping = Map.of(
-            "jakarta.servlet.request.secure_protocol", 
"jakarta.servlet.request.secure_protocol",
-            "jakarta.servlet.request.cipher_suite", 
"jakarta.servlet.request.cipher_suite",
-            "jakarta.servlet.request.key_size", 
"jakarta.servlet.request.key_size",
-            "jakarta.servlet.request.ssl_session", 
"jakarta.servlet.request.ssl_session",
-            "jakarta.servlet.request.X509Certificate", 
"jakarta.servlet.request.X509Certificate",
-            "javax.servlet.request.cipher_suite", 
"jakarta.servlet.request.cipher_suite",
-            "javax.servlet.request.key_size", 
"jakarta.servlet.request.key_size",
-            "javax.servlet.request.ssl_session", 
"jakarta.servlet.request.ssl_session",
-            "javax.servlet.request.X509Certificate", 
"jakarta.servlet.request.X509Certificate");
-
-        iisTlsAttributes = Set.of(
-            "CERT_ISSUER", "CERT_SUBJECT", "CERT_COOKIE", 
"HTTPS_SERVER_SUBJECT", "CERT_FLAGS", "HTTPS_SECRETKEYSIZE",
-            "CERT_SERIALNUMBER", "HTTPS_SERVER_ISSUER", "HTTPS_KEYSIZE");
+        jakartaAttributeMapping =
+                Map.of("jakarta.servlet.request.secure_protocol", 
"jakarta.servlet.request.secure_protocol",
+                        "jakarta.servlet.request.cipher_suite", 
"jakarta.servlet.request.cipher_suite",
+                        "jakarta.servlet.request.key_size", 
"jakarta.servlet.request.key_size",
+                        "jakarta.servlet.request.ssl_session", 
"jakarta.servlet.request.ssl_session",
+                        "jakarta.servlet.request.X509Certificate", 
"jakarta.servlet.request.X509Certificate",
+                        "javax.servlet.request.cipher_suite", 
"jakarta.servlet.request.cipher_suite",
+                        "javax.servlet.request.key_size", 
"jakarta.servlet.request.key_size",
+                        "javax.servlet.request.ssl_session", 
"jakarta.servlet.request.ssl_session",
+                        "javax.servlet.request.X509Certificate", 
"jakarta.servlet.request.X509Certificate");
+
+        iisTlsAttributes = Set.of("CERT_ISSUER", "CERT_SUBJECT", 
"CERT_COOKIE", "HTTPS_SERVER_SUBJECT", "CERT_FLAGS",
+                "HTTPS_SECRETKEYSIZE", "CERT_SERIALNUMBER", 
"HTTPS_SERVER_ISSUER", "HTTPS_KEYSIZE");
     }
 
 


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