You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by re...@apache.org on 2025/01/14 21:32:54 UTC
(sling-org-apache-sling-resourceresolver) 01/01: merge master
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch SLING-12615
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit a9ef687a41cdcfb7df52e8d18c3077b40a083fea
Merge: 9c37b6a 99f07e9
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Jan 14 22:32:43 2025 +0100
merge master
.../resourceresolver/impl/mapping/MapEntries.java | 25 ++++++++++------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --cc src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 0cd8ff8,ae33356..d12009a
--- a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@@ -1563,16 -1799,18 +1563,13 @@@ public class MapEntries implement
}
};
- private MapEntry getMapEntry(String url, final int status, final boolean trailingSlash,
- final String... redirect){
-
- MapEntry mapEntry = null;
- try{
- mapEntry = new MapEntry(url, status, trailingSlash, 0, redirect);
- }catch (IllegalArgumentException iae){
- //ignore this entry
- log.debug("ignored entry due exception ",iae);
+ private MapEntry getMapEntry(final String url, final int status, final String... redirect) {
- return getMapEntry(url, status, 0, redirect);
- }
-
- private MapEntry getMapEntry(final String url, final int status, long order,
- final String... redirect) {
+ try {
- return new MapEntry(url, status, false, order, redirect);
++ return new MapEntry(url, status, false, 0, redirect);
+ } catch (IllegalArgumentException iae) {
+ // ignore this entry
+ log.debug("ignored entry for {} due to exception", url, iae);
+ return null;
}
- return mapEntry;
}
}