This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7c683db415ef9ccf72f8c47a064d5302e412b9fa
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 9b0b2e1c34..dae5a470b4 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1057,7 +1057,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 d4a7efe273..f2fa4a5e93 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,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
