craigmcc    2002/06/22 18:38:32

  Modified:    src/share/org/apache/struts/taglib/html FormTag.java
               src/share/org/apache/struts/util RequestUtils.java
  Log:
  Eliminate double call to ActionForm.reset() when a form bean is created
  by RequestUtils.createActionForm().
  
  PR: Bugzilla #7756
  Submitted by: Chuck Cavaness <chuckcavaness at attbi.com>
  
  Revision  Changes    Path
  1.21      +8 -4      
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- FormTag.java      22 Jun 2002 22:06:33 -0000      1.20
  +++ FormTag.java      23 Jun 2002 01:38:31 -0000      1.21
  @@ -606,6 +606,10 @@
               bean = RequestUtils.createActionForm
                   ((HttpServletRequest) pageContext.getRequest(),
                    mapping, appConfig, servlet);
  +            if (bean instanceof ActionForm) {
  +                ((ActionForm) bean).reset
  +                    (mapping, (HttpServletRequest) pageContext.getRequest());
  +            }
               if (bean == null) {
                   throw new JspException
                       (messages.getMessage("formTag.create", type));
  
  
  
  1.40      +4 -5      
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
  
  Index: RequestUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- RequestUtils.java 22 Jun 2002 22:19:13 -0000      1.39
  +++ RequestUtils.java 23 Jun 2002 01:38:31 -0000      1.40
  @@ -637,7 +637,6 @@
               }
           }
           instance.setServlet(servlet);
  -        instance.reset(mapping, request);
           return (instance);
   
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to