This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 80a1eb5b68 Fix expiration of shared locks
80a1eb5b68 is described below
commit 80a1eb5b68a4d077cf3da795e27aacbdd6a789a3
Author: remm <[email protected]>
AuthorDate: Sat May 23 16:01:48 2026 +0200
Fix expiration of shared locks
---
java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 001f7e3d9d..501f351d28 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -370,7 +370,7 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
// Check expiration of all locks
for (LockInfo currentLock : sharedLocks.values()) {
if (currentLock.hasExpired()) {
- sharedLocks.remove(currentLock.path);
+ sharedLocks.remove(currentLock.token);
}
}
for (LockInfo currentLock : resourceLocks.values()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c6583fd204..57e645f025 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -276,6 +276,9 @@
<code>DataSourceUserDatabase</code> should return a null principal on
a non existing user. (remm)
</fix>
+ <fix>
+ Fix shared lock expiration in WebDAV. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
