commit a1df9dfcb3081b7434fc9fd24af5b664e5496130
author Radu Cotescu <radu@apache.org> Tue Mar 24 12:32:27 2020 +0100
committer Karl Pauls <pauls@apache.org> Tue May 12 12:30:33 2020 +0200
tree 6f323f19aacc0c260ac9d0b4b91fc8fdf09a6047
parent 321a9bdddc71155cfee9c63395a2749b85b9bc5b

SLING-9250 - Selectors are used as extensions when servlets are registered for a capability

main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java

diff --git a/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index 6c8bd63..13ce403 100644
--- a/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
+++ b/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -135,8 +135,10 @@
                     }
                     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()) {