You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/03/28 17:04:45 UTC
cvs commit: jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server HttpServletRequestWrapper.java
vmassol 02/03/28 08:04:45
Modified: framework/src/java/j2ee13/org/apache/cactus/server
HttpServletRequestWrapper.java
Log:
getRequestURL() takes into account the simulated URL (if any). Thanks to Kim Madsen.
Revision Changes Path
1.2 +25 -2 jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/HttpServletRequestWrapper.java
Index: HttpServletRequestWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/HttpServletRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpServletRequestWrapper.java 1 Mar 2002 00:43:45 -0000 1.1
+++ HttpServletRequestWrapper.java 28 Mar 2002 16:04:45 -0000 1.2
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
- * @version $Id: HttpServletRequestWrapper.java,v 1.1 2002/03/01 00:43:45 vmassol Exp $
+ * @version $Id: HttpServletRequestWrapper.java,v 1.2 2002/03/28 16:04:45 vmassol Exp $
*/
public class HttpServletRequestWrapper extends AbstractHttpServletRequestWrapper
{
@@ -92,17 +92,40 @@
// Not modified methods --------------------------------------------------
+ /**
+ * @return the URL from the simulated URL or the real URL
+ * if a simulation URL has not been defined.
+ * @see HttpServletRequest#getRequestURL()
+ */
public StringBuffer getRequestURL()
{
- return this.request.getRequestURL();
+ StringBuffer result;
+
+ if (this.url != null) {
+
+ result = new StringBuffer(this.url.getProtocol() + "://" +
+ getServerName() + ":" + getServerPort() + getContextPath() +
+ getServletPath() + getPathInfo());
+
+ } else {
+ result = this.request.getRequestURL();
+ }
+
+ return result;
}
+ /**
+ * @see HttpServletRequest#setCharacterEncoding(String)
+ */
public void setCharacterEncoding(String env)
throws UnsupportedEncodingException
{
this.request.setCharacterEncoding(env);
}
+ /**
+ * @see HttpServletRequest#getParameterMap()
+ */
public Map getParameterMap()
{
return this.request.getParameterMap();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>