cvs commit: jakarta-struts/src/share/org/apache/struts/upload MultipartIterator.java

[martinc]

martinc     01/06/13 18:12:15

  Modified:    src/share/org/apache/struts/upload MultipartIterator.java
  Log:
  Port the fix for file upload corruption.
  
  Revision  Changes    Path
  1.14      +1 -3      
jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java
  
  Index: MultipartIterator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MultipartIterator.java    2001/05/10 00:56:54     1.13
  +++ MultipartIterator.java    2001/06/14 01:12:14     1.14
  @@ -497,13 +497,11 @@
                           if (cutNewline) {
                               fos.write('\n');
                           }
  +                        cutCarriage = false;
                           if (bytesRead > 0) {
                               if (lineBuffer[bytesRead-1] == '\r') {
                                   bytesRead--;
                                   cutCarriage = true;
  -                            }
  -                            else {
  -                                cutCarriage = false;
                               }
                           }
                           cutNewline = true;