cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic ForwardTag.java

[craigmcc]

craigmcc    01/04/21 16:53:43

  Modified:    src/share/org/apache/struts/taglib/logic ForwardTag.java
  Log:
  When following an ActionForward that is redirecting, prepend the context path
  to the path specified in the forward, in the same way that the controller
  servlet would if this ActionForward were returned from an Action.
  
  PR: Bugzilla #1302
  Submitted by: Stoehr Sukachevin <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.6       +8 -4      
jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java
  
  Index: ForwardTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ForwardTag.java   2001/02/12 21:49:55     1.5
  +++ ForwardTag.java   2001/04/21 23:53:42     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java,v 
1.5 2001/02/12 21:49:55 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/02/12 21:49:55 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java,v 
1.6 2001/04/21 23:53:42 craigmcc Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/04/21 23:53:42 $
    *
    * ====================================================================
    *
  @@ -64,6 +64,7 @@
   
   
   import java.io.IOException;
  +import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.JspWriter;
  @@ -81,7 +82,7 @@
    * ActionForwards collection associated with our application.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.5 $ $Date: 2001/02/12 21:49:55 $
  + * @version $Revision: 1.6 $ $Date: 2001/04/21 23:53:42 $
    */
   
   public class ForwardTag extends TagSupport {
  @@ -153,9 +154,12 @@
        // Forward or redirect to the corresponding actual path
        String path = forward.getPath();
        if (forward.getRedirect()) {
  +            HttpServletRequest request =
  +                (HttpServletRequest) pageContext.getRequest();
            HttpServletResponse response =
                (HttpServletResponse) pageContext.getResponse();
            try {
  +                path = request.getContextPath() + path;
                response.sendRedirect(response.encodeRedirectURL(path));
            } catch (Exception e) {
                   RequestUtils.saveException(pageContext, e);