sling-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] catholicon commented on a change in pull request #5: SLING-7544 - improving optimized alias lookup to not block during int…
Date Mon, 30 Apr 2018 13:30:57 GMT
catholicon 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_r184986718
 
 

 ##########
 File path: src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
 ##########
 @@ -1027,16 +1052,51 @@ 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 (QuerySyntaxException e) {
+			Throwable cause = unwrapThrowable(e);
+			if (cause instanceof IllegalArgumentException) {
 
 Review comment:
   Maybe, also see that fail for traversal is set!?.... I don't see why that should be the
case, but being a bit defensive won't hurt I guess...

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message