cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java

[craigmcc]

craigmcc    01/10/03 19:51:56

  Modified:    src/share/org/apache/struts/action Tag: STRUTS_1_0_BRANCH
                        ActionServlet.java
  Log:
  Unconditionally pass the selected mapping as a request attribute under key
  Action.MAPPING_KEY, even if no form bean is specified.
  
  PR: Bugzilla #2068
  Submitted by: Howard Moore <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.68.2.3  +6 -7      
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
  
  Index: ActionServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
  retrieving revision 1.68.2.2
  retrieving revision 1.68.2.3
  diff -u -r1.68.2.2 -r1.68.2.3
  --- ActionServlet.java        2001/06/13 17:07:55     1.68.2.2
  +++ ActionServlet.java        2001/10/04 02:51:56     1.68.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 
1.68.2.2 2001/06/13 17:07:55 mschachter Exp $
  - * $Revision: 1.68.2.2 $
  - * $Date: 2001/06/13 17:07:55 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 
1.68.2.3 2001/10/04 02:51:56 craigmcc Exp $
  + * $Revision: 1.68.2.3 $
  + * $Date: 2001/10/04 02:51:56 $
    *
    * ====================================================================
    *
  @@ -230,7 +230,7 @@
    * </ul>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.68.2.2 $ $Date: 2001/06/13 17:07:55 $
  + * @version $Revision: 1.68.2.3 $ $Date: 2001/10/04 02:51:56 $
    */
   
   public class ActionServlet
  @@ -1939,6 +1939,8 @@
           ActionMapping mapping = findMapping(path);
           if (mapping == null)
               mapping = mappings.getUnknown(request);
  +        if (mapping != null)
  +            request.setAttribute(Action.MAPPING_KEY, mapping);
           return (mapping);
   
       }
  @@ -2055,9 +2057,6 @@
           if (mapping.getMultipartClass() != null)
               request.setAttribute(Action.MULTIPART_KEY,
                                   mapping.getMultipartClass());
  -        //also pass the mapping through the request
  -        request.setAttribute(Action.MAPPING_KEY,
  -                             mapping);
           RequestUtils.populate(formInstance, mapping.getPrefix(),
                                 mapping.getSuffix(), request);