You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2017/03/25 18:41:07 UTC

[8/9] wicket git commit: WICKET-4201 removing illegal state exception from PageProvider#getPageInstance

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/5422d5fb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5422d5fb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5422d5fb

Branch: refs/heads/master
Commit: 5422d5fbdb9b11e08a894ecb007110e36011b662
Parents: 14bffef
Author: Pedro Henrique Oliveira dos Santos <pe...@apache.org>
Authored: Sun Feb 5 04:36:12 2017 -0200
Committer: Pedro Henrique Oliveira dos Santos <pe...@apache.org>
Committed: Sat Mar 25 14:58:12 2017 -0300

----------------------------------------------------------------------
 .../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/5422d5fb/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/5422d5fb/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();
 	}
 
 	/**