This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 68baf12a2f77b5cc40a9a66a0f52cd8e9d1b8ec5 Author: Mark Thomas <[email protected]> AuthorDate: Thu Sep 11 12:32:28 2025 +0100 Use constant for UNLOCK --- 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 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java index 08dce08a16..1edfffe21e 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, Method.LOCK, "UNLOCK", "ACL", "REPORT", "VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT", + Method.MOVE, Method.LOCK, Method.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 52907941cf..a31a10e22f 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, Method.LOCK, "UNLOCK", Method.COPY, Method.MOVE, Method.PROPFIND, Method.PROPPATCH }; + Method.MKCOL, Method.LOCK, Method.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 eac4c7f828..5fe3e7ad54 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, Method.LOCK, "UNLOCK", Method.COPY, Method.MOVE, Method.PROPFIND, Method.PROPPATCH }; + Method.MKCOL, Method.LOCK, Method.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 249078ffa6..a59d5e40e2 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, Method.LOCK, "UNLOCK", Method.COPY, Method.MOVE, Method.PROPFIND, Method.PROPPATCH }; + Method.MKCOL, Method.LOCK, Method.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 7121b5a7d3..f68af72a7b 100644 --- a/test/org/apache/coyote/ajp/SimpleAjpClient.java +++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java @@ -115,7 +115,7 @@ public class SimpleAjpClient { case Method.LOCK: this.method = 13; break; - case "UNLOCK": + case Method.UNLOCK: this.method = 14; break; case "ACL": @@ -191,7 +191,7 @@ public class SimpleAjpClient { case 13: return Method.LOCK; case 14: - return "UNLOCK"; + return Method.UNLOCK; case 15: return "ACL"; case 16: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
