Author: jochen Date: Wed Jun 6 17:05:29 2007 New Revision: 545004 URL: http://svn.apache.org/viewvc?view=rev&rev=545004 Log: DiskFileItem.toString() could throw an NPE. PR: FILEUPLOAD-134 Submitted-by: Thomas Vandahl, [EMAIL PROTECTED]
Modified: jakarta/commons/proper/fileupload/trunk/pom.xml jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java Modified: jakarta/commons/proper/fileupload/trunk/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/pom.xml?view=diff&rev=545004&r1=545003&r2=545004 ============================================================================== --- jakarta/commons/proper/fileupload/trunk/pom.xml (original) +++ jakarta/commons/proper/fileupload/trunk/pom.xml Wed Jun 6 17:05:29 2007 @@ -97,16 +97,20 @@ <email>[EMAIL PROTECTED]</email> </contributor> <contributor> + <name>Michael Macaluso</name> + <email>[EMAIL PROTECTED]</email> + </contributor> + <contributor> <name>Amichai Rothman</name> <email>[EMAIL PROTECTED]</email> </contributor> <contributor> - <name>Henry Yandell</name> - <email>[EMAIL PROTECTED]</email> + <name>Thomas Vandahl</name> + <email>[EMAIL PROTECTED]</email> </contributor> <contributor> - <name>Michael Macaluso</name> - <email>[EMAIL PROTECTED]</email> + <name>Henry Yandell</name> + <email>[EMAIL PROTECTED]</email> </contributor> </contributors> Modified: jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml?view=diff&rev=545004&r1=545003&r2=545004 ============================================================================== --- jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml (original) +++ jakarta/commons/proper/fileupload/trunk/src/changes/changes.xml Wed Jun 6 17:05:29 2007 @@ -60,6 +60,10 @@ A MalformedStreamException is now thrown, if the size of an items headers exceeds HEADER_PART_SIZE_MAX; </action> + <action dev="jochen" type="fix" issue="FILEUPLOAD-134" + due-to="Thomas Vandahl" due-to-email="[EMAIL PROTECTED]"> + DiskFileItem.toString() could throw an NPE. + </action> </release> <release version="1.2" date="2007-02-13"> Modified: jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java?view=diff&rev=545004&r1=545003&r2=545004 ============================================================================== --- jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java (original) +++ jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java Wed Jun 6 17:05:29 2007 @@ -629,7 +629,7 @@ * memory. */ public File getStoreLocation() { - return dfos.getFile(); + return dfos == null ? null : dfos.getFile(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]