Author: tn
Date: Tue Nov 11 20:41:06 2014
New Revision: 1638377
URL: http://svn.apache.org/r1638377
Log:
[FILEUPLOAD-258] DiskFileItem#getStoreLocation() should return null for items
stored in memory.
Modified:
commons/proper/fileupload/trunk/src/changes/changes.xml
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Modified: commons/proper/fileupload/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/changes/changes.xml?rev=1638377&r1=1638376&r2=1638377&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/changes/changes.xml (original)
+++ commons/proper/fileupload/trunk/src/changes/changes.xml Tue Nov 11 20:41:06
2014
@@ -44,6 +44,7 @@ The <action> type attribute can be add,u
<body>
<release version="1.4" date="TBA" description="TBA">
+ <action issue="FILEUPLOAD-258" dev="tn"
type="fix">DiskFileItem#getStoreLocation() wrongly returned a File object for
items stored in memory</action>
<action issue="FILEUPLOAD-242" dev="tn" type="fix">FileUploadBase -
should not silently catch and ignore all Throwables</action>
<action issue="FILEUPLOAD-257" dev="tn" type="fix">Fix Javadoc 1.8.0
errors</action>
<action issue="FILEUPLOAD-234" dev="tn" type="fix">Fix section "Resource
cleanup" of the user guide</action>
Modified:
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java?rev=1638377&r1=1638376&r2=1638377&view=diff
==============================================================================
---
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
(original)
+++
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Tue Nov 11 20:41:06 2014
@@ -520,6 +520,9 @@ public class DiskFileItem
if (dfos == null) {
return null;
}
+ if (isInMemory()) {
+ return null;
+ }
return dfos.getFile();
}
@@ -569,7 +572,7 @@ public class DiskFileItem
/**
* Returns an identifier that is unique within the class loader used to
- * load this class, but does not have random-like apearance.
+ * load this class, but does not have random-like appearance.
*
* @return A String with the non-random looking instance identifier.
*/
