You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2018/01/31 21:48:45 UTC
[sling-org-apache-sling-scripting-jsp-taglib] branch master
updated: Fixing SLING-7458 by returning an empty iterator if the depth is
greater than the resource depth.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp-taglib.git
The following commit(s) were added to refs/heads/master by this push:
new 463596c Fixing SLING-7458 by returning an empty iterator if the depth is greater than the resource depth.
463596c is described below
commit 463596ca6a2436636ab762ddad1795b30e6dc91f
Author: Dan Klco <da...@gmail.com>
AuthorDate: Wed Jan 31 16:48:38 2018 -0500
Fixing SLING-7458 by returning an empty iterator if the depth is greater than the resource depth.
---
.../org/apache/sling/scripting/jsp/taglib/GetParentsTag.java | 9 +++++++--
.../org/apache/sling/scripting/jsp/taglib/SlingFunctions.java | 8 +++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/jsp/taglib/GetParentsTag.java b/src/main/java/org/apache/sling/scripting/jsp/taglib/GetParentsTag.java
index 67c1b16..7c0d2ed 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/taglib/GetParentsTag.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/taglib/GetParentsTag.java
@@ -63,8 +63,13 @@ public class GetParentsTag extends TagSupport {
}
}
Collections.reverse(parents);
-
- parents = parents.subList(Integer.parseInt(startDepth,10), parents.size());
+
+ int depth = Integer.parseInt(startDepth,10);
+ if(depth <= parents.size()){
+ parents = parents.subList(depth, parents.size());
+ } else {
+ parents.clear();
+ }
log.debug("Saving {} to variable {}", parents, var);
pageContext.setAttribute(var, parents.iterator());
diff --git a/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java b/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
index 80dcef0..85296fa 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
@@ -156,7 +156,13 @@ public class SlingFunctions {
}
Collections.reverse(parents);
- return parents.subList(Integer.parseInt(startDepth, 10), parents.size()).iterator();
+ int depth = Integer.parseInt(startDepth,10);
+ if(depth <= parents.size()){
+ parents = parents.subList(depth, parents.size());
+ } else {
+ parents.clear();
+ }
+ return parents.iterator();
}
/**
--
To stop receiving notification emails like this one, please contact
dklco@apache.org.