Author: jcompagner
Date: Tue Jul  3 06:43:32 2007
New Revision: 552841

URL: http://svn.apache.org/viewvc?view=rev&rev=552841
Log:
fix for wrong redirect url when comming in with a bookmarkable url

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=552841&r1=552840&r2=552841
==============================================================================
--- 
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
 Tue Jul  3 06:43:32 2007
@@ -187,6 +187,13 @@
                                        // here on.
                                        servletResponse.close();
 
+                                       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(null);        
+                                       }
+                                       
                                        redirectUrl = 
page.urlFor(IRedirectListener.INTERFACE).toString();
                                        int index = redirectUrl.indexOf("?");
                                        String sessionId = 
getApplication().getSessionStore().getSessionId(request, true); 


Reply via email to