You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/11/30 20:32:38 UTC
svn commit: r1040722 - in
/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload:
DiskFileItem.java FileUploadException.java
Author: pete
Date: Tue Nov 30 19:32:38 2010
New Revision: 1040722
URL: http://svn.apache.org/viewvc?rev=1040722&view=rev
Log:
WICKET-2833: reverted to Exception being the base class for FileUploadException since IOException does not support nested exception before 1.6
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java?rev=1040722&r1=1040721&r2=1040722&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java Tue Nov 30 19:32:38 2010
@@ -372,23 +372,14 @@ public class DiskFileItem implements Fil
{
File outputFile = getStoreLocation();
- if (outputFile != null)
- {
- /*
- * The uploaded file is being stored on disk in a temporary location so move it to
- * the desired file.
- */
- if (outputFile.renameTo(file) == false)
- {
- Files.copy(outputFile, file);
- }
- }
- else
+ if (outputFile == null)
+ throw new IllegalStateException("for a non-memory upload the file location must not be empty");
+
+ // The uploaded file is being stored on disk in a temporary location so move it to
+ // the desired file.
+ if (outputFile.renameTo(file) == false)
{
- /*
- * For whatever reason we cannot write the file to disk.
- */
- throw new FileUploadException("Cannot write uploaded file to disk!");
+ Files.copy(outputFile, file);
}
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java?rev=1040722&r1=1040721&r2=1040722&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java Tue Nov 30 19:32:38 2010
@@ -16,14 +16,12 @@
*/
package org.apache.wicket.util.upload;
-import java.io.IOException;
-
/**
* Exception for errors encountered while processing the request.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
*/
-public class FileUploadException extends IOException
+public class FileUploadException extends Exception
{
private static final long serialVersionUID = 1L;