Updated Branches: refs/heads/master cfd70cc0f -> 42af7491f
WICKET-4718 ResourceStreamResource#getResourceStream() is called multiple times Remove the optimization by using a (transient / request scoped) cache. TextTemplateResourceResponse breaks with it. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/42af7491 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/42af7491 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/42af7491 Branch: refs/heads/master Commit: 42af7491fd34cfe05cf1df2143a96f7169654811 Parents: cfd70cc Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Aug 20 18:23:05 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Aug 20 18:23:05 2012 +0300 ---------------------------------------------------------------------- .../request/resource/ResourceStreamResource.java | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/42af7491/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java index 7e79b23..3c70f3a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java @@ -50,12 +50,6 @@ public class ResourceStreamResource extends AbstractResource private Duration cacheDuration; /** - * The stream that is returned by #getResourceStream() and is cached only for the request lifecycle. - * This way it is possible to create a new instance of IResourceStream for each request and close it at the end. - */ - private transient IResourceStream requestScopedStream = null; - - /** * Constructor. */ public ResourceStreamResource() @@ -134,11 +128,9 @@ public class ResourceStreamResource extends AbstractResource private IResourceStream internalGetResourceStream() { - if (requestScopedStream == null) { - requestScopedStream = getResourceStream(); - Checks.notNull(requestScopedStream, "%s#getResourceStream() should not return null!", getClass().getName()); - } - return requestScopedStream; + final IResourceStream resourceStream = getResourceStream(); + Checks.notNull(resourceStream, "%s#getResourceStream() should not return null!", getClass().getName()); + return resourceStream; } @Override
