You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/05/11 07:09:22 UTC
svn commit: r1743321 -
/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PlumberServlet.java
Author: olli
Date: Wed May 11 07:09:22 2016
New Revision: 1743321
URL: http://svn.apache.org/viewvc?rev=1743321&view=rev
Log:
SLING-5718 Pipes size parameter is ignored
patch from Jordan Shurmer
Modified:
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PlumberServlet.java
Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PlumberServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PlumberServlet.java?rev=1743321&r1=1743320&r2=1743321&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PlumberServlet.java (original)
+++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PlumberServlet.java Wed May 11 07:09:22 2016
@@ -90,6 +90,9 @@ public class PlumberServlet extends Slin
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 Slin
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 Slin
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 Slin
throw new ServletException(e);
}
}
-}
\ No newline at end of file
+}