Author: pedro
Date: Thu Sep 15 02:41:52 2011
New Revision: 1170932
URL: http://svn.apache.org/viewvc?rev=1170932&view=rev
Log:
preventing the anti-cache parameter encoded in AJAX URL from being propagated
to next requests
Issue: WICKET-4054
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=1170932&r1=1170931&r2=1170932&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
Thu Sep 15 02:41:52 2011
@@ -97,6 +97,7 @@ public abstract class AbstractBookmarkab
// They shouldn't be propagated to the next
requests
cleanParameters.remove(WebRequest.PARAM_AJAX);
cleanParameters.remove(WebRequest.PARAM_AJAX_BASE_URL);
+
cleanParameters.remove(WebRequest.PARAM_AJAX_REQUEST_ANTI_CACHE);
}
return cleanParameters;
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java?rev=1170932&r1=1170931&r2=1170932&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
Thu Sep 15 02:41:52 2011
@@ -30,7 +30,7 @@ public class UrlInfoTest extends Assert
{
/**
- * WICKET-4038
+ * WICKET-4038 & WICKET-4054
*/
@Test
public void wicket4038()
@@ -38,6 +38,7 @@ public class UrlInfoTest extends Assert
PageParameters parameters = new PageParameters();
parameters.add(WebRequest.PARAM_AJAX, "true");
parameters.add(WebRequest.PARAM_AJAX_BASE_URL, "base/url");
+ parameters.add(WebRequest.PARAM_AJAX_REQUEST_ANTI_CACHE,
"12345.6879");
AbstractBookmarkableMapper.UrlInfo info = new UrlInfo(null,
MockPage.class, parameters);
assertTrue(info.getPageParameters().isEmpty());
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java?rev=1170932&r1=1170931&r2=1170932&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java
Thu Sep 15 02:41:52 2011
@@ -44,6 +44,8 @@ public abstract class WebRequest extends
public static final String PARAM_AJAX_BASE_URL = "wicket-ajax-baseurl";
/** marker for Ajax-relative url */
public static final String HEADER_AJAX_BASE_URL = "Wicket-Ajax-BaseURL";
+ /** anti-cache query parameter added by Wicket.Ajax.Request at its URL
*/
+ public static final String PARAM_AJAX_REQUEST_ANTI_CACHE = "random";
/**
* @return request cookies
