Updated Branches: refs/heads/master a6e46251a -> c0b25b980
WICKET-4557 FilteringHeaderResponse#getContent() ignores any configured IHeaderResponseDecorator Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c0b25b98 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c0b25b98 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c0b25b98 Branch: refs/heads/master Commit: c0b25b980201cc8fc2653d5e38528b35b64a1c8d Parents: 9fdc212 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon May 14 15:42:25 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon May 14 15:42:25 2012 +0200 ---------------------------------------------------------------------- .../head/filter/FilteringHeaderResponse.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c0b25b98/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java index 0b8ae49..9b05c04 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java @@ -26,7 +26,6 @@ import org.apache.wicket.MetaDataKey; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.markup.head.ResourceAggregator; import org.apache.wicket.markup.head.internal.HeaderResponse; import org.apache.wicket.markup.html.DecoratingHeaderResponse; import org.apache.wicket.request.Response; @@ -208,14 +207,15 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse } }; - if (Application.get().getResourceSettings().getUseDefaultResourceAggregator()) - headerRenderer = new ResourceAggregator(headerRenderer); + IHeaderResponse headerResponseDecorated = Application.get().decorateHeaderResponse(headerRenderer); for (HeaderItem curItem : resp) { - headerRenderer.render(curItem); + headerResponseDecorated.render(curItem); } + headerRenderer.close(); + return strResponse.getBuffer(); }
