You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/07/06 18:16:52 UTC

svn commit: r791532 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java

Author: ivaynberg
Date: Mon Jul  6 16:16:51 2009
New Revision: 791532

URL: http://svn.apache.org/viewvc?rev=791532&view=rev
Log:
WICKET-2346
Issue: WICKET-2346

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java?rev=791532&r1=791531&r2=791532&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java Mon Jul  6 16:16:51 2009
@@ -247,7 +247,20 @@
 		}
 		catch (WicketRuntimeException e)
 		{
-			throw new InvalidUrlException(e);
+			// we need to let page expired exception sift through instead of covering it up
+
+			if (e instanceof PageExpiredException)
+			{
+				throw e;
+			}
+			else if (e.getCause() instanceof PageExpiredException)
+			{
+				throw e;
+			}
+			else
+			{
+				throw new InvalidUrlException(e);
+			}
 		}
 
 	}