svn commit: r1141569 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java

[pete]

Author: pete
Date: Thu Jun 30 15:24:57 2011
New Revision: 1141569

URL: http://svn.apache.org/viewvc?rev=1141569&view=rev
Log:
WICKET-3841 Redirecting to the home page after binding the session leads to 
Wicket creating an invalid URL

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=1141569&r1=1141568&r2=1141569&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
 Thu Jun 30 15:24:57 2011
@@ -207,8 +207,17 @@ public class ServletWebResponse extends 
                        Url append = Url.parse(url, charset);
                        current.concatSegments(append.getSegments());
                        Url result = new Url(current.getSegments(), 
append.getQueryParameters());
+                       
+                       String path = result.toString();
+                       
+                       // replace redirect to empty path with '/'
+                       if(Strings.isEmpty(path))
+                       {
+                               path = "/";
+                       }
+                       
                        return Strings.join("/", getAbsolutePrefix(), 
httpServletRequest.getContextPath(),
-                               webRequest.getFilterPrefix(), 
result.toString());
+                               webRequest.getFilterPrefix(), path);
                }
        }