(tomcat) branch main updated: Add additional test. lock may be null here

[markt]

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


The following commit(s) were added to refs/heads/main by this push:
     new 4ddcc349b6 Add additional test. lock may be null here
4ddcc349b6 is described below

commit 4ddcc349b6cd19b6a583c322c9aabeb30e4961bb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 22 08:36:22 2024 +0100

    Add additional test. lock may be null here
---
 java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 48b319a965..02cf7c5391 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1637,7 +1637,7 @@ public class WebdavServlet extends DefaultServlet 
implements PeriodicEventListen
                                 if (lockTokenHeader.contains(token)) {
                                     LockInfo lock = sharedLocks.get(token);
                                     if (lock == null || lock.principal == null 
|| lock.principal.equals(req.getRemoteUser())) {
-                                        if ((parentPath != path && lock.depth 
> 0) || parentPath == path) {
+                                        if ((parentPath != path && lock != 
null && lock.depth > 0) || parentPath == path) {
                                             
parentLock.sharedTokens.remove(token);
                                             if 
(parentLock.sharedTokens.isEmpty()) {
                                                 
resourceLocks.remove(parentPath);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org