You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/09/13 11:09:56 UTC
svn commit: r1170096 -
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
Author: mgrigorov
Date: Tue Sep 13 09:09:56 2011
New Revision: 1170096
URL: http://svn.apache.org/viewvc?rev=1170096&view=rev
Log:
WICKET-4038 Don't create an empty PageParameters if the original is null.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.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=1170096&r1=1170095&r2=1170096&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 Tue Sep 13 09:09:56 2011
@@ -88,13 +88,16 @@ public abstract class AbstractBookmarkab
*/
private PageParameters cleanPageParameters(final PageParameters originalParameters)
{
- PageParameters cleanParameters = new PageParameters(originalParameters);
-
- // WICKET-4038: Ajax related parameters are set by wicket-ajax.js when needed.
- // They shouldn't be propagated to the next requests
- cleanParameters.remove(WebRequest.PARAM_AJAX);
- cleanParameters.remove(WebRequest.PARAM_AJAX_BASE_URL);
+ PageParameters cleanParameters = null;
+ if (originalParameters != null)
+ {
+ cleanParameters = new PageParameters(originalParameters);
+ // WICKET-4038: Ajax related parameters are set by wicket-ajax.js when needed.
+ // They shouldn't be propagated to the next requests
+ cleanParameters.remove(WebRequest.PARAM_AJAX);
+ cleanParameters.remove(WebRequest.PARAM_AJAX_BASE_URL);
+ }
return cleanParameters;
}