Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-fileupload.git
Conflicts:
src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/commons-fileupload/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-fileupload/commit/4242ff46
Tree: http://git-wip-us.apache.org/repos/asf/commons-fileupload/tree/4242ff46
Diff: http://git-wip-us.apache.org/repos/asf/commons-fileupload/diff/4242ff46
Branch: refs/heads/master
Commit: 4242ff461ef2fd28a41b04946c0161f3d891da54
Parents: 180f613 b57dcf4
Author: Jochen Wiedmann (jwi) <[email protected]>
Authored: Thu Nov 23 21:10:15 2017 +0100
Committer: Jochen Wiedmann (jwi) <[email protected]>
Committed: Thu Nov 23 21:10:15 2017 +0100
----------------------------------------------------------------------
src/changes/changes.xml | 4 ++++
.../java/org/apache/commons/fileupload/disk/DiskFileItem.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/4242ff46/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index ec6823d,320db1d..0e9ae9c
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -61,7 -61,7 +61,11 @@@ The <action> type attribute can be add,
<action dev="ecki" type="add">Site: added
security report</action>
<action dev="markt" due-to="Felix
Schumacher">Improve performance for large multi-part boundaries</action>
<action issue="FILEUPLOAD-286" dev="jochen" due-to="maxxedev"
due-to-email="[email protected]">Added the default character set to the
DiskFileItem.</action>
++<<<<<<< HEAD
+ <action issue="FILEUPLOAD-288" dev="jochen" due-to=""fangwentong"
due-to-email="[email protected]">Avoid using File.exists() on temporary
files, if we know that the file has been created.</action>
++=======
+ <action dev="jochen" due-to="Pascal Schumacher">Added .travis.yml, to
fix build issues on Github.</action>
++>>>>>>> branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-fileupload.git
</release>
<release version="1.3.3" description="Bugfix release for 1.3.3"
date="2017-06-13">
http://git-wip-us.apache.org/repos/asf/commons-fileupload/blob/4242ff46/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
index 1802131,48004f3..81aeebc
--- a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
@@@ -415,7 -415,7 +415,7 @@@ public class DiskFileIte
public void delete() {
cachedContent = null;
File outputFile = getStoreLocation();
- if (outputFile != null && !isInMemory() && !outputFile.exists()) {
- if (outputFile != null && outputFile.exists()) {
++ if (outputFile != null && !isInMemory() && outputFile.exists()) {
outputFile.delete();
}
}
