You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2011/06/22 21:18:44 UTC
svn commit: r1138591 - in
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request:
mapper/BasicResourceReferenceMapper.java
resource/caching/QueryStringWithTimestampResourceCachingStrategy.java
Author: pete
Date: Wed Jun 22 19:18:43 2011
New Revision: 1138591
URL: http://svn.apache.org/viewvc?rev=1138591&view=rev
Log:
WICKET-3828 QueryStringWithTimestampResourceCachingStrategy#undecorateUrl(ResourceUrl) can causes NPE
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithTimestampResourceCachingStrategy.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java?rev=1138591&r1=1138590&r2=1138591&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java Wed Jun 22 19:18:43 2011
@@ -92,13 +92,6 @@ class BasicResourceReferenceMapper exten
// should be stripped of timestamps
if (i + 1 == segmentsSize)
{
- // since we need mutable page parameters for
- // the caching strategy ensure they are not null
- if (pageParameters == null)
- {
- pageParameters = new PageParameters();
- }
-
// The filename + parameters eventually contain caching
// related information which needs to be removed
ResourceUrl resourceUrl = new ResourceUrl(segment, pageParameters);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithTimestampResourceCachingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithTimestampResourceCachingStrategy.java?rev=1138591&r1=1138590&r2=1138591&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithTimestampResourceCachingStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithTimestampResourceCachingStrategy.java Wed Jun 22 19:18:43 2011
@@ -17,6 +17,7 @@
package org.apache.wicket.request.resource.caching;
import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.lang.Args;
@@ -75,7 +76,12 @@ public class QueryStringWithTimestampRes
public void undecorateUrl(ResourceUrl url)
{
- url.getParameters().remove(timestampParameter);
+ final INamedParameters parameters = url.getParameters();
+
+ if (parameters != null)
+ {
+ parameters.remove(timestampParameter);
+ }
}
public void decorateResponse(AbstractResource.ResourceResponse response)