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 d244b42a62 Code clean-up. Formatting. No functional change.
d244b42a62 is described below
commit d244b42a62c45230c7eea84b681bdacfc162ea7b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 28 15:56:06 2024 +0100
Code clean-up. Formatting. No functional change.
---
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
java/org/apache/coyote/ajp/AjpProcessor.java | 8 ++++----
java/org/apache/coyote/ajp/Constants.java | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 1e11a99352..f1231ad473 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -43,7 +43,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
protected static final StringManager sm =
StringManager.getManager(AbstractAjpProtocol.class);
- public AbstractAjpProtocol(AbstractEndpoint<S, ?> endpoint) {
+ public AbstractAjpProtocol(AbstractEndpoint<S,?> endpoint) {
super(endpoint);
setConnectionTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
@@ -63,7 +63,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
* {@inheritDoc} Overridden to make getter accessible to other classes in
this package.
*/
@Override
- protected AbstractEndpoint<S, ?> getEndpoint() {
+ protected AbstractEndpoint<S,?> getEndpoint() {
return super.getEndpoint();
}
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java
b/java/org/apache/coyote/ajp/AjpProcessor.java
index 0cd678e7b2..1c568b05aa 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -89,7 +89,7 @@ public class AjpProcessor extends AbstractProcessor {
private static final byte[] pongMessageArray;
- private static final Map<String, String> jakartaAttributeMapping;
+ private static final Map<String,String> jakartaAttributeMapping;
private static final Set<String> iisTlsAttributes;
@@ -131,7 +131,7 @@ public class AjpProcessor extends AbstractProcessor {
System.arraycopy(pongMessage.getBuffer(), 0, pongMessageArray, 0,
pongMessage.getLen());
// Build Map of Java Servlet to Jakarta Servlet attribute names
- Map<String, String> m = new HashMap<>();
+ Map<String,String> m = new HashMap<>();
m.put("jakarta.servlet.request.secure_protocol",
"jakarta.servlet.request.secure_protocol");
m.put("jakarta.servlet.request.cipher_suite",
"jakarta.servlet.request.cipher_suite");
m.put("jakarta.servlet.request.key_size",
"jakarta.servlet.request.key_size");
@@ -994,8 +994,8 @@ public class AjpProcessor extends AbstractProcessor {
responseMessage.appendBytes(hV);
} catch (IllegalArgumentException iae) {
// Log the problematic header
-
log.warn(sm.getString("ajpprocessor.response.invalidHeader",
headers.getName(i), headers.getValue(i)),
- iae);
+
log.warn(sm.getString("ajpprocessor.response.invalidHeader", headers.getName(i),
+ headers.getValue(i)), iae);
// Remove the problematic header
headers.removeHeader(i);
numHeaders--;
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index f124d8ebcb..2e4e4de60b 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -104,10 +104,10 @@ public final class Constants {
public static final int MAX_SEND_SIZE = MAX_PACKET_SIZE - SEND_HEAD_LEN;
// Translates integer codes to names of HTTP methods
- private static final String[] methodTransArray = { "OPTIONS", "GET",
"HEAD", "POST", "PUT", "DELETE", "TRACE",
- "PROPFIND", "PROPPATCH", "MKCOL", "COPY", "MOVE", "LOCK",
"UNLOCK", "ACL", "REPORT", "VERSION-CONTROL",
- "CHECKIN", "CHECKOUT", "UNCHECKOUT", "SEARCH", "MKWORKSPACE",
"UPDATE", "LABEL", "MERGE",
- "BASELINE-CONTROL", "MKACTIVITY" };
+ private static final String[] methodTransArray =
+ { "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE",
"PROPFIND", "PROPPATCH", "MKCOL", "COPY",
+ "MOVE", "LOCK", "UNLOCK", "ACL", "REPORT",
"VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
+ "SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE",
"BASELINE-CONTROL", "MKACTIVITY" };
/**
* Converts an AJP coded HTTP method to the method name.
@@ -139,9 +139,9 @@ public final class Constants {
public static final int SC_REQ_USER_AGENT = 14;
// Translates integer codes to request header names
- private static final String[] headerTransArray = { "accept",
"accept-charset", "accept-encoding", "accept-language",
- "authorization", "connection", "content-type", "content-length",
"cookie", "cookie2", "host", "pragma",
- "referer", "user-agent" };
+ private static final String[] headerTransArray =
+ { "accept", "accept-charset", "accept-encoding",
"accept-language", "authorization", "connection",
+ "content-type", "content-length", "cookie", "cookie2",
"host", "pragma", "referer", "user-agent" };
/**
* Converts an AJP coded HTTP request header to the header name.
@@ -169,7 +169,7 @@ public final class Constants {
return responseTransArray[code];
}
- private static final Map<String, Integer> responseTransMap = new
HashMap<>(20);
+ private static final Map<String,Integer> responseTransMap = new
HashMap<>(20);
static {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
