(sling-org-apache-sling-resourceresolver) branch SLING-12701 updated: SLING-12701: MapEntries - move alias handling into inner class - add initializing to constructor

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch SLING-12701
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git


The following commit(s) were added to refs/heads/SLING-12701 by this push:
     new 0146c8e8 SLING-12701: MapEntries - move alias handling into inner 
class - add initializing to constructor
0146c8e8 is described below

commit 0146c8e8012dee1e13843fc6ba76b1766d982bb6
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Thu Mar 6 19:25:20 2025 +0100

    SLING-12701: MapEntries - move alias handling into inner class - add 
initializing to constructor
---
 .../resourceresolver/impl/mapping/MapEntries.java   | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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
index 49e2e4dd..c7d58f81 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -159,7 +159,7 @@ public class MapEntries implements
         this.detectedConflictingAliases = new AtomicLong(0);
         this.detectedInvalidAliases = new AtomicLong(0);
 
-        this.ah = new AliasHandler(this.factory);
+        this.ah = new AliasHandler(this.factory, this.initializing);
 
         this.useOptimizeAliasResolution = ah.initializeAliases();
 
@@ -767,10 +767,13 @@ public class MapEntries implements
 
  class AliasHandler {
 
-   private final MapConfigurationProvider factory;
+    private final MapConfigurationProvider factory;
 
-    public AliasHandler(MapConfigurationProvider factory) {
+    private final ReentrantLock initializing;
+
+     public AliasHandler(MapConfigurationProvider factory, ReentrantLock 
initializing) {
         this.factory = factory;
+        this.initializing = initializing;
     }
 
     /**
@@ -781,7 +784,7 @@ public class MapEntries implements
      */
     protected boolean initializeAliases() {
 
-        MapEntries.this.initializing.lock();
+        this.initializing.lock();
         try {
             final ResourceResolver resolver = MapEntries.this.resolver;
             final MapConfigurationProvider factory = this.factory;
@@ -828,7 +831,7 @@ public class MapEntries implements
 
         } finally {
 
-            MapEntries.this.initializing.unlock();
+            this.initializing.unlock();
 
         }
     }
@@ -874,7 +877,7 @@ public class MapEntries implements
             return false;
         }
 
-        MapEntries.this.initializing.lock();
+        this.initializing.lock();
         try {
             final Map<String, Collection<String>> aliasMapEntry = 
aliasMapsMap.get(contentPath);
             if (aliasMapEntry != null) {
@@ -899,7 +902,7 @@ public class MapEntries implements
             }
             return aliasMapEntry != null;
         } finally {
-            MapEntries.this.initializing.unlock();
+            this.initializing.unlock();
         }
     }
 
@@ -1145,10 +1148,6 @@ public class MapEntries implements
 
     private final long LOGGING_ERROR_PERIOD = 1000 * 60 * 5;
 
-    public void logDisableAliasOptimization() {
-        this.logDisableAliasOptimization(null);
-    }
-
     private void logDisableAliasOptimization(final Exception e) {
         if ( e != null ) {
             log.error("Unexpected problem during initialization of optimize 
alias resolution. Therefore disabling optimize alias resolution. Please fix the 
problem.", e);