Repository: wicket Updated Branches: refs/heads/master a22e192cd -> 013680019
WICKET-5687 content type in header is being lost when using a AbstractTransformerBehavior Preserve the web response's meta data (headers) when AbstractTransformerBehavior is used to transform the page's markup (cherry picked from commit 3b0b2f2032e27445347b5ca24420933b4f32723f) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/01368001 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/01368001 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/01368001 Branch: refs/heads/master Commit: 01368001943155bc5262f9dc0df009d17aa66bda Parents: a22e192 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Aug 29 10:14:01 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Aug 29 10:18:11 2014 +0300 ---------------------------------------------------------------------- .../wicket/markup/transformer/AbstractTransformerBehavior.java | 6 ++++++ .../org/apache/wicket/markup/transformer/ITransformer.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/01368001/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java index d2e14e8..0359bbb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java @@ -17,6 +17,7 @@ package org.apache.wicket.markup.transformer; import org.apache.wicket.Component; +import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.protocol.http.BufferedWebResponse; @@ -82,6 +83,11 @@ public abstract class AbstractTransformerBehavior extends Behavior implements IT { BufferedWebResponse tempResponse = (BufferedWebResponse)requestCycle.getResponse(); + if (component instanceof Page && originalResponse instanceof WebResponse) + { + tempResponse.writeMetaData((WebResponse) originalResponse); + } + // Transform the data CharSequence output = transform(component, tempResponse.getText()); originalResponse.write(output); http://git-wip-us.apache.org/repos/asf/wicket/blob/01368001/wicket-core/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java index 7347214..42995d7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java @@ -19,7 +19,8 @@ package org.apache.wicket.markup.transformer; import org.apache.wicket.Component; /** - * A common interface to be implemented be OutputTransformerContainers and TranformerBehaviors which + * A common interface to be implemented by {@link org.apache.wicket.markup.transformer.AbstractOutputTransformerContainer}s + * and {@link org.apache.wicket.markup.transformer.AbstractTransformerBehavior}s which * post-process the output markup of a component. * * @author Juergen Donnerstag
