svn commit: r550630 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java

[jc...@apache.org]

Author: jcompagner
Date: Mon Jun 25 15:33:41 2007
New Revision: 550630

URL: http://svn.apache.org/viewvc?view=rev&rev=550630
Log:
page redirect url shouldn't be done before the page.render()

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?view=diff&rev=550630&r1=550629&r2=550630
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java Mon Jun 25 15:33:41 2007
@@ -139,12 +139,11 @@
 			final WebResponse currentResponse = getWebResponse();
 			try
 			{
-				redirectUrl = page.urlFor(IRedirectListener.INTERFACE).toString();
 				if (getWebRequest() instanceof ServletWebRequest)
 				{
 					// Get the redirect url and set it in the ServletWebRequest
 					// so that it can be used for relative url calculation.
-					((ServletWebRequest)getWebRequest()).setWicketRedirectUrl(redirectUrl.replaceAll("../", ""));	
+					((ServletWebRequest)getWebRequest()).setWicketRedirectUrl(page.urlFor(IRedirectListener.INTERFACE).toString().replaceAll("../", ""));	
 				}
 				// create the redirect response.
 				final BufferedHttpServletResponse servletResponse = new BufferedHttpServletResponse(
@@ -188,6 +187,7 @@
 					// here on.
 					servletResponse.close();
 
+					redirectUrl = page.urlFor(IRedirectListener.INTERFACE).toString();
 					int index = redirectUrl.indexOf("?");
 					String sessionId = getWebRequest().getHttpServletRequest().getSession(true)
 							.getId();