You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/01/14 22:22:25 UTC
git commit: WICKET-5472 PackageResource#internalGetResourceStream()
should return ProcessingResourceStream only when the resource is existing
Updated Branches:
refs/heads/wicket-6.x 23172242b -> 1cc56f56a
WICKET-5472 PackageResource#internalGetResourceStream() should return ProcessingResourceStream only when the resource is existing
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1cc56f56
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1cc56f56
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1cc56f56
Branch: refs/heads/wicket-6.x
Commit: 1cc56f56aedbb9f0da0c6e1df35a441106568e72
Parents: 2317224
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 14 23:22:05 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 14 23:22:05 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/1cc56f56/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 d6a1530..5d4e935 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
@@ -462,7 +462,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/1cc56f56/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;
}