[sling-org-apache-sling-scripting-bundle-tracker] branch master updated: SLING-9250 - Selectors are used as extensions when servlets are registered for a capability

[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-scripting-bundle-tracker.git


The following commit(s) were added to refs/heads/master by this push:
     new fd90c9c  SLING-9250 - Selectors are used as extensions when servlets are registered for a capability
fd90c9c is described below

commit fd90c9c1bac0d38aedb453536034dfb3698efeb7
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Mar 24 12:32:27 2020 +0100

    SLING-9250 - Selectors are used as extensions when servlets are registered for a capability
---
 .../scripting/bundle/tracker/internal/BundledScriptTracker.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index 6c8bd63..13ce403 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -135,8 +135,10 @@ public class BundledScriptTracker implements BundleTrackerCustomizer<List<Servic
                     }
                     properties.put(ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES, resourceTypesRegistrationValue);
 
-                    Set<String> extensions = new HashSet<>(resourceTypeCapability.getSelectors());
-                    extensions.add("html");
+                    Set<String> extensions = new HashSet<>(resourceTypeCapability.getExtensions());
+                    if (extensions.isEmpty()) {
+                        extensions.add("html");
+                    }
                     properties.put(ServletResolverConstants.SLING_SERVLET_EXTENSIONS, extensions.toArray());
 
                     if (!resourceTypeCapability.getSelectors().isEmpty()) {