Author: ivaynberg
Date: Fri Oct 15 04:58:25 2010
New Revision: 1022820
URL: http://svn.apache.org/viewvc?rev=1022820&view=rev
Log:
fix the tests
Issue: WICKET-3086
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=1022820&r1=1022819&r2=1022820&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Fri Oct 15 04:58:25 2010
@@ -125,7 +125,7 @@ public class ServletWebRequest extends W
{
if (!isAjax())
{
- return Url.parse(getBaseUrl(httpServletRequest,
filterPrefix).toString(), getCharset());
+ return Url.parse(getUrl(httpServletRequest,
filterPrefix).toString(), getCharset());
}
else
{
@@ -145,14 +145,7 @@ public class ServletWebRequest extends W
}
- /**
- * Builds base url for this request
- *
- * @param request
- * @param filterPrefix
- * @return
- */
- private StringBuilder getBaseUrl(HttpServletRequest request, String
filterPrefix)
+ private Url getUrl(HttpServletRequest request, String filterPrefix)
{
if (filterPrefix.length() > 0 && !filterPrefix.endsWith("/"))
{
@@ -164,13 +157,6 @@ public class ServletWebRequest extends W
final int start = request.getContextPath().length() +
filterPrefix.length() + 1;
url.append(uri.substring(start));
- return url;
- }
-
- private Url getUrl(HttpServletRequest request, String filterPrefix)
- {
- StringBuilder url = getBaseUrl(request, filterPrefix);
-
String query = request.getQueryString();
if (!Strings.isEmpty(query))
{
