DominikSuess commented on a change in pull request #5: SLING-7544 - improving 
optimized alias lookup to not block during int…
URL: 
https://github.com/apache/sling-org-apache-sling-resourceresolver/pull/5#discussion_r176112950
 
 

 ##########
 File path: 
src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
 ##########
 @@ -1027,12 +1044,28 @@ private boolean addEntry(final Map<String, 
List<MapEntry>> entryMap, final Strin
      */
     private Map<String, Map<String, String>> loadAliases(final 
ResourceResolver resolver) {
         final Map<String, Map<String, String>> map = new ConcurrentHashMap<>();
-        final String queryString = "SELECT sling:alias FROM nt:base WHERE 
sling:alias IS NOT NULL";
-        final Iterator<Resource> i = resolver.findResources(queryString, 
"sql");
-        while (i.hasNext()) {
-            final Resource resource = i.next();
-            loadAlias(resource, map);
-        }
+        String queryString = "SELECT sling:alias FROM nt:base WHERE 
sling:alias IS NOT NULL";
+               if (this.factory.isForceNoAliasTraversal()) {
+                       queryString += " option(traversal fail)";
+               }
+               while (true){
+               try {
+                       final Iterator<Resource> i = 
resolver.findResources(queryString, "sql");
+                       while (i.hasNext()) {
+                           final Resource resource = i.next();
+                           loadAlias(resource, map);
+                       }
+                       break;
+               } catch (Exception e) {
 
 Review comment:
   @rombert  - I did try to find an appropriate answer and honestly did some 
cargo culting on that one as the cases handling failing traversals that I could 
find did do it that way - I'll crosscheck the oak codebase if we have a 
reliable behavior - esp covering the case as well where the queryengine doesn't 
understand the option for more refined logmessage.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to