svn commit: r1102548 - in /wicket/trunk: wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java

[ivaynberg]

Author: ivaynberg
Date: Fri May 13 02:40:15 2011
New Revision: 1102548

URL: http://svn.apache.org/viewvc?rev=1102548&view=rev
Log:

Issue: WICKET-3567

Modified:
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
    
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java?rev=1102548&r1=1102547&r2=1102548&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
 Fri May 13 02:40:15 2011
@@ -139,4 +139,13 @@ public class UrlRendererTest extends Tes
                UrlRenderer r1 = new UrlRenderer(new 
MockWebRequest(Url.parse("a")));
                assertEquals(".", r1.renderUrl(Url.parse("")));
        }
+
+       /**
+        * <a 
href="https://issues.apache.org/jira/browse/WICKET-3567";>WICKET-3567</a>
+        */
+       public void test12()
+       {
+               UrlRenderer r1 = new UrlRenderer(new 
MockWebRequest(Url.parse("?0")));
+               assertEquals(".", r1.renderUrl(Url.parse("")));
+       }
 }

Modified: 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java?rev=1102548&r1=1102547&r2=1102548&view=diff
==============================================================================
--- 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
 (original)
+++ 
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
 Fri May 13 02:40:15 2011
@@ -119,7 +119,7 @@ public class UrlRenderer
                render.append(protocol);
                render.append("://");
                render.append(host);
-               
+
                if ((port != null) && !port.equals(PROTO_TO_PORT.get(protocol)))
                {
                        render.append(':');
@@ -233,7 +233,8 @@ public class UrlRenderer
                        }
                        newSegments.addAll(urlSegments);
 
-                       return new Url(newSegments, 
url.getQueryParameters()).toString();
+                       String renderedUrl = new Url(newSegments, 
url.getQueryParameters()).toString();
+                       return Strings.isEmpty(renderedUrl) ? "." : renderedUrl;
                }
        }