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

[craigmcc]

craigmcc    01/04/28 20:51:01

  Modified:    src/share/org/apache/struts/taglib/logic ForwardTag.java
  Log:
  Make the context path prepend for a redirect performed by <logic:forward>
  operate identically to the corresponding processing in ActionServlet when an
  Action returns an ActionForward with the redirect flag set.
  
  PR: Bugzilla #1317
  Submitted by: Stoehr Sukachevin <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.7       +6 -5      
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ForwardTag.java   2001/04/21 23:53:42     1.6
  +++ ForwardTag.java   2001/04/29 03:51:01     1.7
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java,v 
1.7 2001/04/29 03:51:01 craigmcc Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/04/29 03:51:01 $
    *
    * ====================================================================
    *
  @@ -82,7 +82,7 @@
    * ActionForwards collection associated with our application.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.6 $ $Date: 2001/04/21 23:53:42 $
  + * @version $Revision: 1.7 $ $Date: 2001/04/29 03:51:01 $
    */
   
   public class ForwardTag extends TagSupport {
  @@ -159,7 +159,8 @@
            HttpServletResponse response =
                (HttpServletResponse) pageContext.getResponse();
            try {
  -                path = request.getContextPath() + path;
  +                if (path.startsWith("/"))
  +                    path = request.getContextPath() + path;
                response.sendRedirect(response.encodeRedirectURL(path));
            } catch (Exception e) {
                   RequestUtils.saveException(pageContext, e);