svn commit: r699550 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/protocol/http/RequestUtils.java test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java

[ivaynberg]

Author: ivaynberg
Date: Fri Sep 26 20:52:26 2008
New Revision: 699550

URL: http://svn.apache.org/viewvc?rev=699550&view=rev
Log:
WICKET-1846

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java?rev=699550&r1=699549&r2=699550&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestUtils.java
 Fri Sep 26 20:52:26 2008
@@ -184,8 +184,7 @@
         *            path, relative to requestPath
         * @return absolute path for given url
         */
-       public final static String toAbsolutePath(final String requestPath,
-               final String relativePagePath)
+       public final static String toAbsolutePath(final String requestPath, 
String relativePagePath)
        {
                final StringBuffer result;
                if (requestPath.endsWith("/"))
@@ -198,6 +197,11 @@
                        result = new StringBuffer(requestPath.substring(0, 
requestPath.lastIndexOf('/') + 1));
                }
 
+               if (relativePagePath.startsWith("./"))
+               {
+                       relativePagePath = relativePagePath.substring(2);
+               }
+
                if (relativePagePath.startsWith("../"))
                {
                        StringBuffer tempRelative = new 
StringBuffer(relativePagePath);

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java?rev=699550&r1=699549&r2=699550&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/RequestUtilsTest.java
 Fri Sep 26 20:52:26 2008
@@ -83,5 +83,11 @@
                        "http://aif.ru/blah/zzz";);
                
assertEquals(RequestUtils.toAbsolutePath("http://aif.ru/blah/test";, "zzz"),
                        "http://aif.ru/blah/zzz";);
+               
assertEquals(RequestUtils.toAbsolutePath("http://aif.ru/blah/test";, "./zzz"),
+                       "http://aif.ru/blah/zzz";);
+               
assertEquals(RequestUtils.toAbsolutePath("http://aif.ru/blah/test";, "./"),
+                       "http://aif.ru/blah/";);
+               assertEquals(RequestUtils.toAbsolutePath("http://aif.ru/";, 
"./"), "http://aif.ru/";);
+
        }
 }