svn commit: r1138587 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java

[pete]

Author: pete
Date: Wed Jun 22 19:08:52 2011
New Revision: 1138587

URL: http://svn.apache.org/viewvc?rev=1138587&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

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=1138587&r1=1138586&r2=1138587&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:08:52 2011
@@ -92,6 +92,13 @@ 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);