(tomcat) branch main updated: Remove unnecessary code. lock cannot 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 5210336116 Remove unnecessary code. lock cannot be null here
5210336116 is described below

commit 5210336116dfe307e828558d97266e29035c48ff
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 22 08:35:35 2024 +0100

    Remove unnecessary code. lock cannot 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 cfcbabe262..48b319a965 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1734,7 +1734,7 @@ public class WebdavServlet extends DefaultServlet 
implements PeriodicEventListen
                                 if (lock != null) {
                                     if ((parentPath != path && lock.depth > 0) 
|| parentPath == path) {
                                         if (ifHeader.contains(":" + token + 
">")
-                                                && (lock == null || 
lock.principal == null || lock.principal.equals(principal))) {
+                                                && (lock.principal == null || 
lock.principal.equals(principal))) {
                                             return false;
                                         }
                                         unmatchedSharedLock = true;


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