Bugfix: Fixed JCR Query for Redirect Manager after change in redirect…

… resource as sling:folder
Adobe-Consulting-Services · Nov 24, 2024 · 979a298 · 979a298
1 parent 213279b
commit 979a298
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+### Fixed
+- #3479 - Fixed JCR Query for Redirect Manager after change in "redirect" resource as "sling:Folder"
+
 ## 6.9.6 - 2024-11-20
 
 ### Fixed

diff --git a/bundle/src/main/java/com/adobe/acs/commons/redirects/models/Configurations.java b/bundle/src/main/java/com/adobe/acs/commons/redirects/models/Configurations.java
@@ -54,8 +54,10 @@ public class Configurations {
     private static final String REDIRECTS_RESOURCE_TYPE = "acs-commons/components/utilities/manage-redirects/redirects";
 
     public Collection<RedirectConfiguration> getConfigurations() {
-        String sql = "SELECT * FROM [nt:unstructured] AS s WHERE ISDESCENDANTNODE([/conf]) "
-                + "AND s.[sling:resourceType]='" + REDIRECTS_RESOURCE_TYPE + "'";
+        String sql = "SELECT * FROM [nt:base] AS s WHERE ISDESCENDANTNODE(s, [/conf]) "
+                + "AND s.[sling:resourceType]='" + REDIRECTS_RESOURCE_TYPE + "' "
+                + "AND s.[jcr:primaryType] IN ('nt:unstructured', 'sling:folder')";
+
         log.debug(sql);
         Iterator<Resource> it = request.getResourceResolver().findResources(sql, Query.JCR_SQL2);
         List<RedirectConfiguration> lst = new ArrayList<>();