[tomcat] 02/02: Fix BZ 66621 - remove expired locks from correct collection
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
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 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 622 by Alex Kachanov. (markt)
+
+66621: Attempts to lock a collection with WebDAV may
+incorrectly fail if a child collection has an expired lock. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix BZ 66621 - remove expired locks from correct collection
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 65d73d2aabd5abeceac5158ffb233efc047f4549
Author: Mark Thomas
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 6f09cf5c7c..1ef73559a2 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1059,7 +1059,7 @@ public class WebdavServlet extends DefaultServlet {
List 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 402c2745a1..552fa08471 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
listings produced by the default servlet to enable sorting in the XSLT.
Pull request 622 by Alex Kachanov. (markt)
+
+66621: Attempts to lock a collection with WebDAV may
+incorrectly fail if a child collection has an expired lock. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix BZ 66621 - remove expired locks from correct collection
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 38fba760458219a111e6c84927eb48a9dc623f74
Author: Mark Thomas
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 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 f773d17d38..62af0f6618 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,10 @@
listings produced by the default servlet to enable sorting in the XSLT.
Pull request 622 by Alex Kachanov. (markt)
+
+66621: Attempts to lock a collection with WebDAV may
+incorrectly fail if a child collection has an expired lock. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix BZ 66621 - remove expired locks from correct collection
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
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 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 622 by Alex Kachanov. (markt)
+
+66621: Attempts to lock a collection with WebDAV may
+incorrectly fail if a child collection has an expired lock. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
