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 54a56cf31d Better naming 54a56cf31d is described below commit 54a56cf31de9b6672f51c849a4a4d57b5edaaaa9 Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Aug 27 12:36:29 2025 +0100 Better naming --- java/org/apache/catalina/webresources/FileResource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/webresources/FileResource.java b/java/org/apache/catalina/webresources/FileResource.java index e57c43a16a..8237ff20d2 100644 --- a/java/org/apache/catalina/webresources/FileResource.java +++ b/java/org/apache/catalina/webresources/FileResource.java @@ -65,7 +65,7 @@ public class FileResource extends AbstractResource { private final Manifest manifest; private final boolean needConvert; private final WebResourceLockSet lockSet; - private final String lockKey; + private final String lockPath; public FileResource(WebResourceRoot root, String webAppPath, File resource, boolean readOnly, Manifest manifest) { this(root, webAppPath, resource, readOnly, manifest, null, null); @@ -73,11 +73,11 @@ public class FileResource extends AbstractResource { public FileResource(WebResourceRoot root, String webAppPath, File resource, boolean readOnly, Manifest manifest, - WebResourceLockSet lockSet, String lockKey) { + WebResourceLockSet lockSet, String lockPath) { super(root, webAppPath); this.resource = resource; this.lockSet = lockSet; - this.lockKey = lockKey; + this.lockPath = lockPath; if (webAppPath.charAt(webAppPath.length() - 1) == '/') { String realName = resource.getName() + '/'; @@ -136,7 +136,7 @@ public class FileResource extends AbstractResource { */ Lock writeLock = null; if (lockSet != null) { - writeLock = lockSet.getLock(lockKey).writeLock(); + writeLock = lockSet.getLock(lockPath).writeLock(); writeLock.lock(); } try { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org