(tomcat) branch 10.1.x 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 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new c29c5bf59d Code clean-up  - formatting. No functional change.
c29c5bf59d is described below

commit c29c5bf59de361d690386c59a2da8d093d6e15cf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 31 13:52:02 2025 +0100

    Code clean-up  - formatting. No functional change.
---
 java/org/apache/coyote/ajp/AjpProcessor.java | 32 +++++++++++++---------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java 
b/java/org/apache/coyote/ajp/AjpProcessor.java
index ad477d190e..0adafbc3ab 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -128,19 +128,17 @@ 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.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.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");
     }
 
 
@@ -765,12 +763,12 @@ public class AjpProcessor extends AbstractProcessor {
 
                 case Constants.SC_A_CONTEXT:
                     requestHeaderMessage.getBytes(tmpMB);
-                // nothing
+                    // nothing
                     break;
 
                 case Constants.SC_A_SERVLET_PATH:
                     requestHeaderMessage.getBytes(tmpMB);
-                // nothing
+                    // nothing
                     break;
 
                 case Constants.SC_A_REMOTE_USER:
@@ -801,7 +799,7 @@ public class AjpProcessor extends AbstractProcessor {
 
                 case Constants.SC_A_JVM_ROUTE:
                     requestHeaderMessage.getBytes(tmpMB);
-                // nothing
+                    // nothing
                     break;
 
                 case Constants.SC_A_SSL_CERT:
@@ -839,7 +837,7 @@ public class AjpProcessor extends AbstractProcessor {
                     break;
 
                 default:
-                // Ignore unknown attribute for backward compatibility
+                    // Ignore unknown attribute for backward compatibility
                     break;
 
             }


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