SLING-12636: Resource Resolver: add test coverage for background init…

… - fix MapEntries internal state when loadVanityPaths is called a second time
apache · Jan 27, 2025 · ea037cd · ea037cd
1 parent 4df109b
commit ea037cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -1166,8 +1166,10 @@ protected void initializeVanityPaths() throws IOException {
         this.initializing.lock();
         try {
             if (this.factory.isVanityPathEnabled()) {
+                vanityPathsProcessed.set(false);
                 this.vanityBloomFilter = createVanityBloomFilter();
                 VanityPathInitializer vpi = new VanityPathInitializer(this.factory);
+
                 if (this.factory.isVanityPathCacheInitInBackground()) {
                     this.log.debug("bg init starting");
                     Thread vpinit = new Thread(vpi, "VanityPathInitializer");

diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/VanityPathMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/VanityPathMapEntriesTest.java
@@ -181,7 +181,6 @@ private void waitForBgInit() {
 
     // get vanity paths (after waiting for bg init to complete)
     private void initializeVanityPaths() throws IOException {
-        getVanityPathsProcessed().set(false);
         mapEntries.initializeVanityPaths();
         waitForBgInit();
     }