Updated Branches: refs/heads/wicket-1.5.x af491a85a -> d779109a3
WICKET-4594 moved pageParameters omission to AbstractBookmarkableMapper Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d779109a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d779109a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d779109a Branch: refs/heads/wicket-1.5.x Commit: d779109a395a072b5eda3d61c69ff141317966d0 Parents: af491a8 Author: svenmeier <[email protected]> Authored: Tue Mar 5 09:53:24 2013 +0100 Committer: svenmeier <[email protected]> Committed: Tue Mar 5 09:53:24 2013 +0100 ---------------------------------------------------------------------- .../wicket/request/handler/PageProvider.java | 12 +----------- .../request/mapper/AbstractBookmarkableMapper.java | 3 ++- 2 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d779109a/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java index 2685bb7..27effa8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java @@ -261,17 +261,7 @@ public class PageProvider implements IPageProvider, IIntrospectablePageProvider { if (pageClass != null) { - PageParameters parameters; - if (pageId != null) - { - // WICKET-4594 - re-creating an expired page. Ignore the parsed parameters for the callback url - parameters = new PageParameters(); - } - else - { - parameters = pageParameters; - } - page = getPageSource().newPageInstance(pageClass, parameters); + page = getPageSource().newPageInstance(pageClass, pageParameters); freshCreated = true; } } http://git-wip-us.apache.org/repos/asf/wicket/blob/d779109a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java index 9042158..d5d358d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java @@ -234,8 +234,9 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper if (listenerInterface != null) { + // WICKET-4594 - ignore the parsed parameters as they have nothing to do with the page PageAndComponentProvider provider = new PageAndComponentProvider(pageInfo.getPageId(), - pageClass, pageParameters, renderCount, componentInfo.getComponentPath()); + pageClass, null, renderCount, componentInfo.getComponentPath()); provider.setPageSource(getContext());
