WICKET-5472 PackageResource#internalGetResourceStream() should return ProcessingResourceStream only when the resource is existing
(cherry picked from commit 1cc56f56aedbb9f0da0c6e1df35a441106568e72) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c2b49a6c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c2b49a6c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c2b49a6c Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration Commit: c2b49a6cb0748664119c2279e5556d3874ced59b Parents: e96dab0 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Tue Jan 14 23:22:05 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Tue Jan 14 23:22:28 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/request/resource/PackageResource.java | 6 +++++- .../org/apache/wicket/util/resource/ResourceStreamWrapper.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java index ad03e22..dd23147 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java @@ -461,7 +461,11 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl ". See IPackageResourceGuard"); } - return new ProcessingResourceStream(resourceStream); + if (resourceStream != null) + { + resourceStream = new ProcessingResourceStream(resourceStream); + } + return resourceStream; } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java index 8b78be3..11b6253 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java @@ -36,7 +36,7 @@ public class ResourceStreamWrapper implements IResourceStream this.delegate = Args.notNull(delegate, "delegate"); } - protected IResourceStream getDelegate() + public IResourceStream getDelegate() { return delegate; }
