Author: pete
Date: Thu Jun 30 11:48:33 2011
New Revision: 1141491
URL: http://svn.apache.org/viewvc?rev=1141491&view=rev
Log:
WICKET-3846 cache key is create too late
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java?rev=1141491&r1=1141490&r2=1141491&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/RequestCycleCachedResourceVersion.java
Thu Jun 30 11:48:33 2011
@@ -84,6 +84,9 @@ public class RequestCycleCachedResourceV
// retrieve cache from current request cycle
cache = requestCycle.getMetaData(CACHE_KEY);
+ // create caching key
+ key = new CacheResourceVersionKey(resourceReference,
streamInfo);
+
// does cache exist within current request cycle?
if (cache == null)
{
@@ -95,8 +98,6 @@ public class RequestCycleCachedResourceV
// lookup timestamp from cache (may contain
NULL values which are valid)
return cache.get(key);
}
- // create caching key
- key = new CacheResourceVersionKey(resourceReference,
streamInfo);
}
// no cache entry found, query version from delegate
