You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by le...@apache.org on 2001/04/10 19:41:29 UTC

cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/upload TurbineUploadService.java

legassick    01/04/10 10:41:29

  Modified:    src/java/org/apache/turbine/services/upload
                        TurbineUploadService.java
  Log:
  Close FileItem's output stream after reading data from the MultipartStream.
  (fixes problem with non-file parameters being lost)
  
  Submitted by: Pere Torrodellas <pt...@fihoca.com>
  
  Revision  Changes    Path
  1.10      +10 -5     jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
  
  Index: TurbineUploadService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TurbineUploadService.java	2001/03/22 10:18:46	1.9
  +++ TurbineUploadService.java	2001/04/10 17:41:28	1.10
  @@ -83,7 +83,7 @@
    * html widget.
    *
    * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
  - * @version $Id: TurbineUploadService.java,v 1.9 2001/03/22 10:18:46 rafal Exp $
  + * @version $Id: TurbineUploadService.java,v 1.10 2001/04/10 17:41:28 legassick Exp $
    */
   public class TurbineUploadService
       extends TurbineBaseService
  @@ -176,7 +176,9 @@
                               if (getFileName() != null)
                               {
                                   FileItem item = createItem(path, requestSize);
  -                                multi.readBodyData(item.getOutputStream());
  +                                OutputStream os = item.getOutputStream();
  +                                multi.readBodyData(os);
  +                                os.close();
                                   params.append(getFieldName(), item);
                               }
                               else
  @@ -195,15 +197,18 @@
                           {
                               // A single file.
                               FileItem item = createItem(path, requestSize);
  -                            multi.readBodyData(item.getOutputStream());
  +                            OutputStream os = item.getOutputStream();
  +                            multi.readBodyData(os);
  +                            os.close();
                               params.append(getFieldName(), item);
                           }
                           else
                           {
                               // A form field.
                               FileItem item = createItem(path, requestSize);
  -                            multi.readBodyData(item.getOutputStream());
  -                            String fieldData = new String(item.get());
  +                            OutputStream os = item.getOutputStream();
  +                            multi.readBodyData(os);
  +                            os.close();
                               params.append(getFieldName(), new String(item.get()));
                           }
                       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/upload TurbineUploadService.java

Posted by Jon Stevens <jo...@latchkey.com>.
on 4/10/01 10:41 AM, "legassick@apache.org" <le...@apache.org> wrote:

> FileItem item = createItem(path, requestSize);
> -                                multi.readBodyData(item.getOutputStream());
> +                                OutputStream os = item.getOutputStream();
> +                                multi.readBodyData(os);
> +                                os.close();

Please put that into a try/finally block.

-jon

-- 
If you come from a Perl or PHP background, JSP is a way to take
your pain to new levels. --Anonymous
<http://jakarta.apache.org/velocity/ymtd/ymtd.html>


---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org