This is an automated email from the ASF dual-hosted git repository.
pauls 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 91694f5 SLING-9406 - Add bundled script support to the servlets
resolver
91694f5 is described below
commit 91694f5efd9c58c5c45e45aa1985b4d4243c653d
Author: Karl Pauls <[email protected]>
AuthorDate: Wed May 13 23:41:06 2020 +0200
SLING-9406 - Add bundled script support to the servlets resolver
---
.../resolver/internal/resource/ServletResourceProviderFactory.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
index 7e61e31..aafa484 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/resource/ServletResourceProviderFactory.java
@@ -221,11 +221,8 @@ public class ServletResourceProviderFactory {
// add the unmodified path
pathSet.add(path);
- if (StringUtils.isEmpty(FilenameUtils.getExtension(path))) {
- // ensure we have another entry which has the .servlet
ext. if there wasn't one to begin with
- // Radu says: this will make sure that scripts are equal
to servlets in the resolution process
- pathSet.add(ensureServletNameExtension(path));
- }
+ // ensure we have another entry which has the .servlet ext.
+ pathSet.add(ensureServletNameExtension(path));
}
}
}