Author: almaw
Date: Mon Mar 24 16:15:16 2008
New Revision: 640638
URL: http://svn.apache.org/viewvc?rev=640638&view=rev
Log:
WICKET-1416 fix query params being ignored on root redirect
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=640638&r1=640637&r2=640638&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Mon Mar 24 16:15:16 2008
@@ -199,11 +199,11 @@
else
{
long ifModifiedSince;
- try
+ try
{
ifModifiedSince =
httpServletRequest.getDateHeader("If-Modified-Since");
}
- catch (IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
log.warn("Invalid
If-Modified-Since header", e);
ifModifiedSince = -1;
@@ -256,7 +256,12 @@
if (relativePath.length() == 0 &&
!Strings.stripJSessionId(servletRequest.getRequestURI()).endsWith("/"))
{
- final String redirectUrl =
servletRequest.getRequestURI() + "/";
+ String redirectUrl = servletRequest.getRequestURI() +
"/";
+ String queryString = servletRequest.getQueryString();
+ if (queryString != null)
+ {
+ redirectUrl += "?" + queryString;
+ }
servletResponse.sendRedirect(servletResponse.encodeRedirectURL(redirectUrl));
return true;
}
@@ -356,7 +361,7 @@
{
// Process request
cycle.request();
-
+
return cycle.wasHandled();
}
catch (AbortException e)
