Repository: wicket Updated Branches: refs/heads/WICKET-4201-improved-page-provider fe68c817a -> b64f2b4b2
WICKET-4201 removing illegal state exception from PageProvider#getPageInstance Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b64f2b4b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b64f2b4b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b64f2b4b Branch: refs/heads/WICKET-4201-improved-page-provider Commit: b64f2b4b2cb50a594cabb50a0c1eeca43485f6b9 Parents: fe68c81 Author: Pedro Henrique Oliveira dos Santos <[email protected]> Authored: Sun Feb 5 04:36:12 2017 -0200 Committer: Pedro Henrique Oliveira dos Santos <[email protected]> Committed: Sun Feb 5 04:36:12 2017 -0200 ---------------------------------------------------------------------- .../request/handler/ListenerRequestHandler.java | 20 +++++--------------- .../core/request/handler/PageProvider.java | 8 +------- 2 files changed, 6 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b64f2b4b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java index cc4f7fd..d36cce9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java @@ -95,23 +95,13 @@ public class ListenerRequestHandler @Override public IRequestablePage getPage() { - try - { - return pageComponentProvider.getPageInstance(); - } - catch (IllegalStateException e) + IRequestablePage page = pageComponentProvider.getPageInstance(); + if (page == null && pageComponentProvider.wasExpired()) { - if (pageComponentProvider.wasExpired()) - { - - throw new PageExpiredException( - "Page with id '" + pageComponentProvider.getPageId() + "' has expired."); - } - else - { - throw e;// bubbles up - } + throw new PageExpiredException( + "Page with id '" + pageComponentProvider.getPageId() + "' has expired."); } + return page; } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/b64f2b4b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/PageProvider.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/PageProvider.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/PageProvider.java index 261502b..f558a5e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/PageProvider.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/PageProvider.java @@ -170,13 +170,7 @@ public class PageProvider implements IPageProvider, IClusterable @Override public IRequestablePage getPageInstance() { - Provision resolvedProvision = getResolvedProvision(); - - if (!resolvedProvision.didResolveToPage() && !resolvedProvision.doesProvideNewPage()) - { - throw new IllegalStateException("The configured page provider can't resolve a page."); - } - return resolvedProvision.getPage(); + return getResolvedProvision().getPage(); } /**
