[sling-org-apache-sling-pipes] 09/31: SLING-5718 Pipes size parameter is ignored

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.pipes-0.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git

commit 18e222eb35a0a78b72f5820033ba5cd2e43a0b7d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed May 11 07:09:22 2016 +0000

    SLING-5718 Pipes size parameter is ignored
    
    patch from Jordan Shurmer
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-pipes@1743321 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/pipes/PlumberServlet.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/pipes/PlumberServlet.java b/src/main/java/org/apache/sling/pipes/PlumberServlet.java
index 277a484..c0efe83 100644
--- a/src/main/java/org/apache/sling/pipes/PlumberServlet.java
+++ b/src/main/java/org/apache/sling/pipes/PlumberServlet.java
@@ -90,6 +90,9 @@ public class PlumberServlet extends SlingAllMethodsServlet {
             String dryRun = request.getParameter(BasePipe.DRYRUN_KEY);
             String paramBindings = request.getParameter(PARAM_BINDINGS);
             int size = request.getParameter(PARAM_SIZE) != null ? Integer.parseInt(request.getParameter(PARAM_SIZE)) : NB_MAX;
+            if (size < 0) {
+                size = Integer.MAX_VALUE;
+            }
 
             Map additionalBindings = null;
             if (StringUtils.isNotBlank(dryRun) && dryRun.equals(Boolean.TRUE.toString())) {
@@ -135,7 +138,7 @@ public class PlumberServlet extends SlingAllMethodsServlet {
                 writer.key(KEY_ITEMS).array();
                 while (resourceIterator.hasNext()){
                     Resource resource = resourceIterator.next();
-                    if (i ++ < NB_MAX) {
+                    if (++i < size) {
                         writer.object();
                         writer.key(PATH_KEY).value(resource.getPath());
                         Iterator<String> keys = writerObj.keys();
@@ -154,7 +157,7 @@ public class PlumberServlet extends SlingAllMethodsServlet {
                 writer.key(KEY_ITEMS);
                 writer.array();
                 for (String resource : resources) {
-                    if (i ++ > NB_MAX){
+                    if (++i > size){
                         break;
                     } else {
                         writer.value(resource);
@@ -168,4 +171,4 @@ public class PlumberServlet extends SlingAllMethodsServlet {
             throw new ServletException(e);
         }
     }
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.