Updated Branches: refs/heads/wicket-1.5.x 678f3a274 -> cf46110a5
WICKET-4718 ResourceStreamResource#getResourceStream() is called multiple times Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cf46110a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cf46110a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cf46110a Branch: refs/heads/wicket-1.5.x Commit: cf46110a51c6a5cf2628a0dd46207f36b4fda740 Parents: 678f3a2 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Aug 20 18:25:28 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Aug 20 18:25:28 2012 +0300 ---------------------------------------------------------------------- .../request/resource/ResourceStreamResource.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cf46110a/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 34e3282..115ae5d 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 @@ -51,7 +51,7 @@ public class ResourceStreamResource extends AbstractResource /** * Construct. - * + * * @param stream */ public ResourceStreamResource(IResourceStream stream) @@ -120,7 +120,7 @@ public class ResourceStreamResource extends AbstractResource private IResourceStream internalGetResourceStream() { final IResourceStream resourceStream = getResourceStream(); - Checks.notNull(resourceStream, "%s#getResourceStream() should not return null!", ResourceStreamResource.class.getName()); + Checks.notNull(resourceStream, "%s#getResourceStream() should not return null!", getClass().getName()); return resourceStream; } @@ -153,7 +153,7 @@ public class ResourceStreamResource extends AbstractResource catch (ResourceStreamNotFoundException e) { data.setError(HttpServletResponse.SC_NOT_FOUND); - close(); + close(resourceStream); } } @@ -181,7 +181,7 @@ public class ResourceStreamResource extends AbstractResource public void writeData(Attributes attributes) { ((IResourceStreamWriter)resourceStream).write(attributes.getResponse()); - close(); + close(resourceStream); } }); } @@ -199,7 +199,7 @@ public class ResourceStreamResource extends AbstractResource } finally { - close(); + close(resourceStream); } } }); @@ -209,11 +209,11 @@ public class ResourceStreamResource extends AbstractResource return data; } - private void close() + private void close(IResourceStream stream) { try { - internalGetResourceStream().close(); + stream.close(); } catch (IOException e) {
