(sling-org-apache-sling-resourceresolver) branch SLING-12769 updated: SLING-12769: alias refactoring - MapEntries - push alias added logic into AliasHandler

[reschke]

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

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


The following commit(s) were added to refs/heads/SLING-12769 by this push:
     new 552f468f SLING-12769: alias refactoring - MapEntries - push alias 
added logic into AliasHandler
552f468f is described below

commit 552f468fde6d3ceff5d18457af8f393e9f185b2c
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Tue Apr 29 16:51:51 2025 +0100

    SLING-12769: alias refactoring - MapEntries - push alias added logic into 
AliasHandler
---
 .../apache/sling/resourceresolver/impl/mapping/AliasHandler.java    | 6 +++++-
 .../org/apache/sling/resourceresolver/impl/mapping/MapEntries.java  | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
index 8dd3278d..e6e3faa3 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
@@ -159,7 +159,11 @@ class AliasHandler {
     }
 
     boolean doAddAlias(final Resource resource) {
-        return loadAlias(resource, this.aliasMapsMap, null, null);
+        if (cacheIsInitialized) {
+            return loadAlias(resource, this.aliasMapsMap, null, null);
+        } else {
+            return false;
+        }
     }
 
     /**
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 1419692f..1fe1c29d 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
@@ -52,7 +52,6 @@ import org.apache.sling.api.resource.ValueMap;
 import 
org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
 import org.apache.sling.api.resource.observation.ResourceChange;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
-import org.apache.sling.resourceresolver.impl.ResourceResolverImpl;
 import org.apache.sling.resourceresolver.impl.ResourceResolverMetrics;
 import org.jetbrains.annotations.NotNull;
 import org.osgi.framework.BundleContext;
@@ -177,10 +176,7 @@ public class MapEntries implements MapEntriesHandler, 
ResourceChangeListener, Ex
             final Resource resource = this.resolver != null ? 
resolver.getResource(path) : null;
             if (resource != null) {
                 boolean vanityPathAdded = vph.doAddVanity(resource);
-                boolean aliasAdded = false;
-                if (this.ah.usesCache() && 
resource.getValueMap().containsKey(ResourceResolverImpl.PROP_ALIAS)) {
-                    aliasAdded |= ah.doAddAlias(resource);
-                }
+                boolean aliasAdded = ah.doAddAlias(resource);
                 return vanityPathAdded || aliasAdded;
             } else {
                 return false;