You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by re...@apache.org on 2025/03/07 10:22:11 UTC
(sling-org-apache-sling-resourceresolver) branch SLING-12703 created (now b8979c9c)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch SLING-12703
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
at b8979c9c SLING-12703: no NPE when initializeAliases() called after dispose()
This branch includes the following new commits:
new b8979c9c SLING-12703: no NPE when initializeAliases() called after dispose()
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(sling-org-apache-sling-resourceresolver) 01/01: SLING-12703: no NPE when initializeAliases() called after dispose()
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch SLING-12703
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit b8979c9c80c6a81212ff50fc5db6c1c501579154
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Mar 7 11:21:51 2025 +0100
SLING-12703: no NPE when initializeAliases() called after dispose()
---
.../org/apache/sling/resourceresolver/impl/mapping/MapEntries.java | 7 +++----
.../sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java | 7 +++++++
2 files changed, 10 insertions(+), 4 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 3be2e3ef..3e241210 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
@@ -756,10 +756,9 @@ public class MapEntries implements
this.initializing.lock();
try {
- final ResourceResolver resolver = this.resolver;
- final MapConfigurationProvider factory = this.factory;
- if (resolver == null || factory == null) {
- return this.factory.isOptimizeAliasResolutionEnabled();
+ // already disposed?
+ if (this.resolver == null || this.factory == null) {
+ return false;
}
List<String> conflictingAliases = new ArrayList<>();
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
index 53e85c2b..8441e05c 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AliasMapEntriesTest.java
@@ -1148,4 +1148,11 @@ public class AliasMapEntriesTest extends AbstractMappingMapEntriesTest {
aliasMapEntry = mapEntries.getAliasMap("/parent");
assertEquals(Collections.emptyMap(), aliasMapEntry);
}
+
+ @Test
+ public void test_initAliasesAfterDispose() throws Exception {
+ mapEntries.dispose();
+ boolean enabled = mapEntries.initializeAliases();
+ assertFalse("return value (isOptimizeAliasResolutionEnabled) should be false", enabled);
+ }
}