You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2016/01/03 16:01:00 UTC
wicket git commit: WICKET-6061 Improved PackageResource#getCacheKey
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 897c2c387 -> d118063ec
WICKET-6061 Improved PackageResource#getCacheKey
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d118063e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d118063e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d118063e
Branch: refs/heads/wicket-7.x
Commit: d118063ec9b371a3412b9fe8d6e292aee55862aa
Parents: 897c2c3
Author: Andrea Del Bene <ad...@apache.org>
Authored: Sat Jan 2 20:18:49 2016 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Sun Jan 3 15:59:38 2016 +0100
----------------------------------------------------------------------
.../wicket/request/resource/PackageResource.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d118063e/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 899e4c4..8b4efc5 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
@@ -255,16 +255,17 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl
@Override
public Serializable getCacheKey()
{
- IResourceStream stream = getResourceStream();
-
+ Class<?> scope = getScope();
+ String currentStyle = getCurrentStyle();
+ Locale currentLocale = getCurrentLocale();
+
// if resource stream can not be found do not cache
- if (stream == null)
+ if (exists(scope, absolutePath, currentLocale, currentStyle, variation))
{
- return null;
+ return new CacheKey(scopeName, absolutePath, currentLocale, currentStyle, variation);
}
- return new CacheKey(scopeName, absolutePath, stream.getLocale(), stream.getStyle(),
- stream.getVariation());
+ return null;
}
/**