[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-9571 - Nested selector scripts do not have a path-based registered servlet

[ra...@apache.org]

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

radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 208e935  SLING-9571 - Nested selector scripts do not have a path-based registered servlet
208e935 is described below

commit 208e935a22f3267e86153403e965f806ee9dd43e
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Jul 7 17:45:44 2020 +0200

    SLING-9571 - Nested selector scripts do not have a path-based registered servlet
---
 .../servlets/resolver/bundle/tracker/internal/BundledScriptTracker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/internal/BundledScriptTracker.java b/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/internal/BundledScriptTracker.java
index f51b3d6..ba94cf2 100644
--- a/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/internal/BundledScriptTracker.java
+++ b/src/main/java/org/apache/sling/servlets/resolver/bundle/tracker/internal/BundledScriptTracker.java
@@ -234,7 +234,7 @@ public class BundledScriptTracker implements BundleTrackerCustomizer<List<Servic
                             }
                             if (!properties.containsKey(ServletResolverConstants.SLING_SERVLET_PATHS)) {
                                 bundledRenderUnitCapability.getResourceTypes().forEach(resourceType -> {
-                                    if (StringUtils.isNotEmpty(executableParentPath) && executableParentPath.equals(resourceType.toString())) {
+                                    if (StringUtils.isNotEmpty(executableParentPath) && (executableParentPath + "/").startsWith(resourceType.toString() + "/")) {
                                         properties.put(ServletResolverConstants.SLING_SERVLET_PATHS, finalExecutable.getPath());
                                     }
                                 });