Fix for inconsistent metadata was incomplete

Need to add key to map once created so it is visible to other threads
apache · Nov 15, 2024 · 684247a · 684247a
1 parent 6066fb5
commit 684247a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -382,6 +382,7 @@ public ResourceLock lockForRead(String path) {
             resourceLock = resourceLocksByPath.get(key);
             if (resourceLock == null) {
                 resourceLock = new ResourceLock(key);
+                resourceLocksByPath.put(key, resourceLock);
             }
             resourceLock.count.incrementAndGet();
         }
@@ -419,6 +420,7 @@ public ResourceLock lockForWrite(String path) {
             resourceLock = resourceLocksByPath.get(key);
             if (resourceLock == null) {
                 resourceLock = new ResourceLock(key);
+                resourceLocksByPath.put(key, resourceLock);
             }
             resourceLock.count.incrementAndGet();
         }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
         constructors or property related methods throw a checked exception.
         (remm)
       </fix>
+      <fix>
+        The previous fix for incosistent resource metadata during concurrent
+        reads and writes was incomplete. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">