Author: jcompagner
Date: Sat Nov 3 12:56:04 2007
New Revision: 591669
URL: http://svn.apache.org/viewvc?rev=591669&view=rev
Log:
fix for/from WICKET-991
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=591669&r1=591668&r2=591669&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Sat Nov 3 12:56:04 2007
@@ -142,7 +142,7 @@
public String getPath()
{
return
((WebApplication)Application.get()).getWicketFilter().getRelativePath(
- httpServletRequest);
+ httpServletRequest);
}
public String getRelativePathPrefixToContextRoot()
@@ -207,7 +207,7 @@
/**
* Gets the depth of this request relative to the Wicket handler.
*
- * @return
+ * @return the depth
*/
public int getDepthRelativeToWicketHandler()
{
@@ -267,7 +267,7 @@
// stuff, with a leading slash.
String forwardUrl =
(String)httpRequest.getAttribute("javax.servlet.forward.servlet_path");
- if (forwardUrl != null)
+ if (forwardUrl != null && forwardUrl.length() > 0)
{
// If this is an error page, this will be /mount or
/?wicket:foo
relativeUrl = forwardUrl.substring(1);
@@ -455,15 +455,15 @@
public String toString()
{
return "[method = " + httpServletRequest.getMethod() + ",
protocol = " +
- httpServletRequest.getProtocol() + ",
requestURL = " +
- httpServletRequest.getRequestURL() + ",
contentType = " +
- httpServletRequest.getContentType() + ",
contentLength = " +
- httpServletRequest.getContentLength() + ",
contextPath = " +
- httpServletRequest.getContextPath() + ",
pathInfo = " +
- httpServletRequest.getPathInfo() + ",
requestURI = " +
- httpServletRequest.getRequestURI() + ",
servletPath = " +
- httpServletRequest.getServletPath() + ",
pathTranslated = " +
- httpServletRequest.getPathTranslated() + "]";
+ httpServletRequest.getProtocol() + ", requestURL = " +
+ httpServletRequest.getRequestURL() + ", contentType = "
+
+ httpServletRequest.getContentType() + ", contentLength
= " +
+ httpServletRequest.getContentLength() + ", contextPath
= " +
+ httpServletRequest.getContextPath() + ", pathInfo = " +
+ httpServletRequest.getPathInfo() + ", requestURI = " +
+ httpServletRequest.getRequestURI() + ", servletPath = "
+
+ httpServletRequest.getServletPath() + ", pathTranslated
= " +
+ httpServletRequest.getPathTranslated() + "]";
}
/**
