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 befff31661e71317a22bdf06f4273a73fccb522a Author: Oliver Lietz <[email protected]> AuthorDate: Thu Sep 29 17:44:37 2016 +0000 SLING-6073 pipe writer and additionalbindings configurations added through POST break the pipe patch from Nicolas Peltier git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-pipes@1762816 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/pipes/PipeBindings.java | 3 +++ src/main/java/org/apache/sling/pipes/impl/CustomWriter.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/pipes/PipeBindings.java b/src/main/java/org/apache/sling/pipes/PipeBindings.java index 7d48e1d..4925b83 100644 --- a/src/main/java/org/apache/sling/pipes/PipeBindings.java +++ b/src/main/java/org/apache/sling/pipes/PipeBindings.java @@ -75,6 +75,9 @@ public class PipeBindings { if (additionalBindings != null) { ValueMap bindings = additionalBindings.adaptTo(ValueMap.class); addBindings(bindings); + for (String ignoredProperty : BasePipe.IGNORED_PROPERTIES){ + getBindings().remove(ignoredProperty); + } } Resource scriptsResource = resource.getChild(PN_ADDITIONALSCRIPTS); diff --git a/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java b/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java index 1841355..dfa35a9 100644 --- a/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java +++ b/src/main/java/org/apache/sling/pipes/impl/CustomWriter.java @@ -20,6 +20,7 @@ import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.commons.json.JSONException; +import org.apache.sling.pipes.BasePipe; import org.apache.sling.pipes.DefaultOutputWriter; import java.util.HashMap; @@ -33,7 +34,6 @@ public class CustomWriter extends DefaultOutputWriter { public static final String PARAM_WRITER = "writer"; - public static final String[] IGNORED_KEYS = {"jcr:primaryType"}; Map<String, Object> customOutputs; @@ -43,7 +43,7 @@ public class CustomWriter extends DefaultOutputWriter { if (resource != null){ customOutputs = new HashMap<>(); customOutputs.putAll(resource.adaptTo(ValueMap.class)); - for (String ignoredKey : IGNORED_KEYS){ + for (String ignoredKey : BasePipe.IGNORED_PROPERTIES){ customOutputs.remove(ignoredKey); } return true; @@ -61,4 +61,4 @@ public class CustomWriter extends DefaultOutputWriter { } writer.endObject(); } -} \ No newline at end of file +} -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
