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/05 16:17:42 UTC
wicket git commit: WICKET-6061 improved getChacheKey to fix problems
with absolute path of package resources
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 36198d9e9 -> 8dbfe4c88
WICKET-6061 improved getChacheKey to fix problems with absolute path of package resources
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8dbfe4c8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8dbfe4c8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8dbfe4c8
Branch: refs/heads/wicket-7.x
Commit: 8dbfe4c88810643b172e931d98804f929676255a
Parents: 36198d9
Author: Andrea Del Bene <ad...@apache.org>
Authored: Tue Jan 5 16:14:53 2016 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Jan 5 16:17:24 2016 +0100
----------------------------------------------------------------------
.../org/apache/wicket/request/resource/PackageResource.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8dbfe4c8/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 8b4efc5..ad5a919 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
@@ -259,8 +259,13 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl
String currentStyle = getCurrentStyle();
Locale currentLocale = getCurrentLocale();
+ IResourceStream packageResource = Application.get()
+ .getResourceSettings()
+ .getResourceStreamLocator()
+ .locate(scope, absolutePath, currentStyle, variation, currentLocale, null, false);
+
// if resource stream can not be found do not cache
- if (exists(scope, absolutePath, currentLocale, currentStyle, variation))
+ if (packageResource != null)
{
return new CacheKey(scopeName, absolutePath, currentLocale, currentStyle, variation);
}