Updated Branches: refs/heads/wicket-1.5.x 426d0f708 -> ddb89f500
WICKET-4342 Allow resources disable the flushing of the response after setting the headers Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ddb89f50 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ddb89f50 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ddb89f50 Branch: refs/heads/wicket-1.5.x Commit: ddb89f500749ecdb0242894431476076f2cd455f Parents: 426d0f7 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jan 17 16:34:02 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jan 17 16:34:38 2012 +0100 ---------------------------------------------------------------------- .../wicket/request/resource/AbstractResource.java | 17 ++++++++++++-- 1 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ddb89f50/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java index a3ce3da..201e005 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java @@ -606,13 +606,24 @@ public abstract class AbstractResource implements IResource } // 6. Flush the response - // This is necessary for firefox if this resource is an image, otherwise it messes up - // other images on page - webResponse.flush(); + flushResponseAfterHeaders(webResponse); } } /** + * Flushes the response after setting the headers. + * This is necessary for Firefox if this resource is an image, + * otherwise it messes up other images on page. + * + * @param response + * the current web response + */ + protected void flushResponseAfterHeaders(final WebResponse response) + { + response.flush(); + } + + /** * Callback invoked when resource data needs to be written to response. Subclass needs to * implement the {@link #writeData(org.apache.wicket.request.resource.IResource.Attributes)} * method.
