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

[rleland]

rleland     2003/09/30 13:28:35

  Modified:    src/share/org/apache/struts/action Action.java
  Log:
  Bug# 23530  patch submitted by matthias.fraass at tricoder.net
  Cast method call to avoid recursively calling itself 1
  
  Thanks !
  
  Revision  Changes    Path
  1.72      +12 -12    jakarta-struts/src/share/org/apache/struts/action/Action.java
  
  Index: Action.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Action.java       29 Sep 2003 04:26:23 -0000      1.71
  +++ Action.java       30 Sep 2003 20:28:35 -0000      1.72
  @@ -202,7 +202,7 @@
                   form,
                   (HttpServletRequest) request,
                   (HttpServletResponse) response);
  -                
  +
           } catch (ClassCastException e) {
               return null;
           }
  @@ -421,9 +421,9 @@
        * This will be removed after Struts 1.2.
        */
       protected void saveErrors(HttpServletRequest request, ActionErrors errors) {
  -        this.saveErrors(request, errors);
  +        this.saveErrors(request,(ActionMessages)errors);
       }
  -    
  +
       /**
        * Save the specified error messages keys into the appropriate request
        * attribute for use by the <html:errors> tag, if any messages
  @@ -454,9 +454,9 @@
        * ensure that the request attribute is not created.
        *
        * @param request The servlet request we are processing.
  -     * @param messages The messages to save. <code>null</code> or empty 
  +     * @param messages The messages to save. <code>null</code> or empty
        * messages removes any existing ActionMessages in the request.
  -     * 
  +     *
        * @since Struts 1.1
        */
       protected void saveMessages(
  @@ -472,7 +472,7 @@
           // Save the messages we need
           request.setAttribute(Globals.MESSAGE_KEY, messages);
       }
  -    
  +
       /**
        * Save the specified messages keys into the appropriate session
        * attribute for use by the &lt;html:messages&gt; tag (if
  @@ -480,9 +480,9 @@
        * ensure that the session attribute is not created.
        *
        * @param session The session to save the messages in.
  -     * @param messages The messages to save. <code>null</code> or empty 
  +     * @param messages The messages to save. <code>null</code> or empty
        * messages removes any existing ActionMessages in the session.
  -     * 
  +     *
        * @since Struts 1.2
        */
       protected void saveMessages(
  
  
  

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