(tomcat) branch main updated: Revert "Need to pass key, not path"

[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 7729032517 Revert "Need to pass key, not path"
7729032517 is described below

commit 7729032517ce512aa16b137518e7b9d47aad5975
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 27 12:30:40 2025 +0100

    Revert "Need to pass key, not path"
    
    This reverts commit fae5c134f3bf5a9f799aa7cc7e7413e196709de7.
---
 java/org/apache/catalina/webresources/DirResourceSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 04a5885826..5b51775007 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -123,7 +123,7 @@ public class DirResourceSet extends AbstractFileResourceSet 
implements WebResour
                 if (f.isDirectory() && path.charAt(path.length() - 1) != '/') {
                     path = path + '/';
                 }
-                return new FileResource(root, path, f, readOnly, 
getManifest(), this, readOnly ? null : getLockKey(path));
+                return new FileResource(root, path, f, readOnly, 
getManifest(), this, readOnly ? null : path);
             } finally {
                 if (readLock != null) {
                     readLock.unlock();


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