Author: markt
Date: Wed Jul 9 23:58:55 2014
New Revision: 1609340
URL: http://svn.apache.org/r1609340
Log:
Merge changes from FileUpload up to r1596086.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
Merged
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:r1569133-1596086
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=1609340&r1=1609339&r2=1609340&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
Wed Jul 9 23:58:55 2014
@@ -292,7 +292,7 @@ public class DiskFileItem
InputStream fis = null;
try {
- fis = new BufferedInputStream(new FileInputStream(dfos.getFile()));
+ fis = new FileInputStream(dfos.getFile());
IOUtils.readFully(fis, fileData);
} catch (IOException e) {
fileData = null;
@@ -395,6 +395,7 @@ public class DiskFileItem
out = new BufferedOutputStream(
new FileOutputStream(file));
IOUtils.copy(in, out);
+ out.close();
} finally {
IOUtils.closeQuietly(in);
IOUtils.closeQuietly(out);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1609340&r1=1609339&r2=1609340&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 9 23:58:55 2014
@@ -225,6 +225,10 @@
Update package renamed Apache Commons DBCP2 to r1609329 to pick up a
minor bug fix. (markt)
</update>
+ <update>
+ Update package renamed Apache Commons FileUpload to r1596086 to pick
+ various bug fixes. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
