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

[martinc]

martinc     2002/07/08 23:40:03

  Modified:    src/share/org/apache/struts/action ActionServlet.java
  Log:
  Fix the use of the 'multipartClass' init-param so that it provides an
  override for the default sub-app.
  
  PR: 10542
  Submitted by: Martin Cooper
  
  Revision  Changes    Path
  1.112     +12 -6     
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.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- ActionServlet.java        7 Jul 2002 18:45:18 -0000       1.111
  +++ ActionServlet.java        9 Jul 2002 06:40:03 -0000       1.112
  @@ -268,10 +268,11 @@
    *     <em>DEPRECATED - Configure this using the "maxFileSize" attribute of
    *     the &lt;controller&gt; element.</em></li>
    * <li><strong>multipartClass</strong> - The fully qualified name of the
  - *     MultiplartRequestHandler implementation class to be used for processing
  + *     MultipartRequestHandler implementation class to be used for processing
    *     file uploads. If set to <code>none</code>, disables Struts multipart
    *     request handling.  [org.apache.struts.upload.DiskMultipartRequestHandler]
  - *     FIXME - check this</li>
  + *     <em>DEPRECATED - Configure this using the "multipartClass" attribute of
  + *     the &lt;controller&gt; element.</em></li>
    * <li><strong>nocache</strong> - If set to <code>true</code>, add HTTP headers
    *     to every response intended to defeat browser caching of any response we
    *     generate or forward to.  [false]
  @@ -292,6 +293,7 @@
    *
    * @author Craig R. McClanahan
    * @author Ted Husted
  + * @author Martin Cooper
    * @version $Revision$ $Date$
    */
   
  @@ -1268,6 +1270,10 @@
               } else {
                   cc.setNocache(false);
               }
  +        }
  +        value = getServletConfig().getInitParameter("multipartClass");
  +        if (value != null) {
  +            cc.setMultipartClass(value);
           }
           value = getServletConfig().getInitParameter("tempDir");
           if (value != null) {
  
  
  

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