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
commit dc5c75f1829bed2f80536497b0b06e9da638e243 Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed May 31 17:56:36 2023 +0100 Fix BZ 66621 - remove expired locks from correct collection https://bz.apache.org/bugzilla/show_bug.cgi?id=66621 --- java/org/apache/catalina/servlets/WebdavServlet.java | 2 +- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java index 067c3d5a49..c9be178963 100644 --- a/java/org/apache/catalina/servlets/WebdavServlet.java +++ b/java/org/apache/catalina/servlets/WebdavServlet.java @@ -1058,7 +1058,7 @@ public class WebdavServlet extends DefaultServlet { List<String> lockPaths = new ArrayList<>(); for (LockInfo currentLock : collectionLocks) { if (currentLock.hasExpired()) { - resourceLocks.remove(currentLock.path); + collectionLocks.remove(currentLock); continue; } if (currentLock.path.startsWith(lock.path) && diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 64288bff17..ca43056856 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ listings produced by the default servlet to enable sorting in the XSLT. Pull request <pr>622</pr> by Alex Kachanov. (markt) </add> + <fix> + <bug>66621</bug>: Attempts to lock a collection with WebDAV may + incorrectly fail if a child collection has an expired lock. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org