tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1456920 - in /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: ./ FileUploadBase.java package-info.java
Date Fri, 15 Mar 2013 12:13:51 GMT
Author: markt
Date: Fri Mar 15 12:13:51 2013
New Revision: 1456920

URL: http://svn.apache.org/r1456920
Log:
Merge updates from Commons FileUpload to r1456918

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/   (props changed)
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java

Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
  Merged /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:r1456918

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=1456920&r1=1456919&r2=1456920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java Fri Mar 15
12:13:51 2013
@@ -303,10 +303,8 @@ public abstract class FileUploadBase {
                             String.format("Processing of %s request failed. ",
                                     MULTIPART_FORM_DATA, e.getMessage()), e);
                 }
-                if (fileItem instanceof FileItemHeadersSupport) {
-                    final FileItemHeaders fih = item.getHeaders();
-                    fileItem.setHeaders(fih);
-                }
+                final FileItemHeaders fih = item.getHeaders();
+                fileItem.setHeaders(fih);
             }
             successful = true;
             return items;

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java?rev=1456920&r1=1456919&r2=1456920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java Fri Mar 15
12:13:51 2013
@@ -18,7 +18,7 @@
 
 /**
  * <p><b>NOTE:</b> This code has been copied from commons-fileupload trunk
- * revision 1xxxxxx and commons-io 1.4 and package renamed to avoid clashes with
+ * revision 1456918 and commons-io 1.4 and package renamed to avoid clashes with
  * any web apps that may wish to use these libraries.
  * </p>
  * <p>



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


Mime
View raw message