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
commit f5b096c81501b774cd15ce21a52921f214a90e2a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 11 12:32:01 2025 +0100
Use constant for LOCK
---
java/org/apache/coyote/ajp/Constants.java | 2 +-
.../apache/catalina/servlets/TestWebdavServletOptionCollection.java | 2 +-
test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java | 2 +-
.../org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java | 2 +-
test/org/apache/coyote/ajp/SimpleAjpClient.java | 4 ++--
test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index c944943b50..08dce08a16 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -108,7 +108,7 @@ public final class Constants {
// Translates integer codes to names of HTTP methods
private static final String[] methodTransArray =
{ Method.OPTIONS, Method.GET, Method.HEAD, Method.POST,
Method.PUT, Method.OPTIONS, Method.TRACE, Method.TRACE, Method.PROPPATCH,
Method.MKCOL, Method.COPY,
- Method.MOVE, "LOCK", "UNLOCK", "ACL", "REPORT",
"VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
+ Method.MOVE, Method.LOCK, "UNLOCK", "ACL", "REPORT",
"VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
"SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE",
"BASELINE-CONTROL", "MKACTIVITY" };
/**
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
index 0ca34e23ff..52907941cf 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
@@ -38,7 +38,7 @@ public class TestWebdavServletOptionCollection extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE,
- Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, Method.MOVE,
Method.PROPFIND, Method.PROPPATCH };
+ Method.MKCOL, Method.LOCK, "UNLOCK", Method.COPY, Method.MOVE,
Method.PROPFIND, Method.PROPPATCH };
List<Object[]> result = new ArrayList<>();
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
index b978b60af3..eac4c7f828 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
@@ -38,7 +38,7 @@ public class TestWebdavServletOptionsFile extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE,
- Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, Method.MOVE,
Method.PROPFIND, Method.PROPPATCH };
+ Method.MKCOL, Method.LOCK, "UNLOCK", Method.COPY, Method.MOVE,
Method.PROPFIND, Method.PROPPATCH };
List<Object[]> result = new ArrayList<>();
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
index afae9df3d0..249078ffa6 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
@@ -38,7 +38,7 @@ public class TestWebdavServletOptionsUnknown extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE,
- Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, Method.MOVE,
Method.PROPFIND, Method.PROPPATCH };
+ Method.MKCOL, Method.LOCK, "UNLOCK", Method.COPY, Method.MOVE,
Method.PROPFIND, Method.PROPPATCH };
List<Object[]> result = new ArrayList<>();
diff --git a/test/org/apache/coyote/ajp/SimpleAjpClient.java
b/test/org/apache/coyote/ajp/SimpleAjpClient.java
index 37c4fd8dcb..7121b5a7d3 100644
--- a/test/org/apache/coyote/ajp/SimpleAjpClient.java
+++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java
@@ -112,7 +112,7 @@ public class SimpleAjpClient {
case Method.MOVE:
this.method = 12;
break;
- case "LOCK":
+ case Method.LOCK:
this.method = 13;
break;
case "UNLOCK":
@@ -189,7 +189,7 @@ public class SimpleAjpClient {
case 12:
return Method.MOVE;
case 13:
- return "LOCK";
+ return Method.LOCK;
case 14:
return "UNLOCK";
case 15:
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index 4664382dd3..79f5d81de0 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -391,7 +391,7 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
@Test
public void testMethod() throws Exception {
RequestDescriptor desc = new RequestDescriptor();
- desc.putRequestInfo("REQUEST-METHOD", "LOCK");
+ desc.putRequestInfo("REQUEST-METHOD", Method.LOCK);
desc.putRequestInfo("REQUEST-URI", "/testMethod");
doSnoopTest(desc);
}
@@ -468,7 +468,7 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
desc.putRequestInfo("REQUEST-REMOTE-HOST", "MYCLIENT");
desc.putRequestInfo("REQUEST-REMOTE-ADDR", "10.1.2.3");
desc.putRequestInfo("REQUEST-REMOTE-PORT", "34567");
- desc.putRequestInfo("REQUEST-METHOD", "LOCK");
+ desc.putRequestInfo("REQUEST-METHOD", Method.LOCK);
desc.putRequestInfo("REQUEST-URI", "/a/b/c");
desc.putRequestInfo("REQUEST-PROTOCOL", "HTTP/1.x");
desc.putRequestInfo("REQUEST-IS-SECURE", "true");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
