Updated Branches: refs/heads/wicket-1.5.x 477667462 -> d3053686c
WICKET-5256 Allow configuring the resource used by ResourceStreamRequestHandler Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d3053686 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d3053686 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d3053686 Branch: refs/heads/wicket-1.5.x Commit: d3053686c458353fb2b13b25282d80c04b8f502d Parents: 4776674 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jun 27 14:27:01 2013 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jun 27 14:31:27 2013 +0300 ---------------------------------------------------------------------- .../resource/ResourceStreamRequestHandler.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d3053686/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java index 8f3caf1..3e0eee8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceStreamRequestHandler.java @@ -130,6 +130,20 @@ public class ResourceStreamRequestHandler implements IRequestHandler, ILoggableR requestCycle.getResponse()); ResourceStreamResource resource = new ResourceStreamResource(resourceStream); + + configure(resource); + + resource.respond(attributes); + } + + /** + * Configures the ResourceStreamResource used by this request handler + * + * @param resource + * the resource to configure + */ + protected void configure(ResourceStreamResource resource) + { resource.setFileName(fileName); if (contentDisposition != null) { @@ -138,7 +152,7 @@ public class ResourceStreamRequestHandler implements IRequestHandler, ILoggableR else { resource.setContentDisposition(Strings.isEmpty(fileName) ? ContentDisposition.INLINE - : ContentDisposition.ATTACHMENT); + : ContentDisposition.ATTACHMENT); } final Duration cacheDuration = getCacheDuration(); @@ -146,8 +160,6 @@ public class ResourceStreamRequestHandler implements IRequestHandler, ILoggableR { resource.setCacheDuration(cacheDuration); } - - resource.respond(attributes); } @Override
