Author: ivaynberg
Date: Fri Feb  5 06:45:25 2010
New Revision: 906825

URL: http://svn.apache.org/viewvc?rev=906825&view=rev
Log:
WICKET-2615 URL mismatch with RENDER_TO_BUFFER when URL rewriting features of 
container are used
Issue: WICKET-2615

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?rev=906825&r1=906824&r2=906825&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
 Fri Feb  5 06:45:25 2010
@@ -198,12 +198,15 @@
                                        }
 
                                        redirectUrl = 
page.urlFor(IRedirectListener.INTERFACE).toString();
-                                       String stripped = 
Strings.replaceAll(redirectUrl, "../", "").toString();
+                                       String stripped = 
Strings.stripJSessionId(Strings.replaceAll(redirectUrl,
+                                               "../", "").toString());
                                        int index = stripped.indexOf("?");
+                                       String bufferId = 
stripped.substring(index + 1);
+
                                        String sessionId = 
getApplication().getSessionStore().getSessionId(request,
                                                true);
-                                       
((WebApplication)application).addBufferedResponse(sessionId,
-                                               stripped.substring(index + 1), 
servletResponse);
+                                       
((WebApplication)application).addBufferedResponse(sessionId, bufferId,
+                                               servletResponse);
                                }
                        }
                        catch (RuntimeException ex)


Reply via email to