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:48:44 UTC
svn commit: r1040734 - in /wicket/trunk:
wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
Author: pete
Date: Tue Nov 30 19:48:44 2010
New Revision: 1040734
URL: http://svn.apache.org/viewvc?rev=1040734&view=rev
Log:
WICKET-2833: once again let "FileUploadException extends IOException" after I got some neat trick from martin-g (thanks!) to work around a limitation of IOException before 1.6.
Also removed FileUpload.writeTo(File, buffersize) since handling of buffer sizes should not be the job of the web developer but the framework.
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
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=1040734&r1=1040733&r2=1040734&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:48:44 2010
@@ -16,12 +16,14 @@
*/
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 Exception
+public class FileUploadException extends IOException
{
private static final long serialVersionUID = 1L;
@@ -51,7 +53,8 @@ public class FileUploadException extends
*/
public FileUploadException(Throwable cause)
{
- super(cause);
+ super();
+ initCause(cause);
}
/**
@@ -64,6 +67,7 @@ public class FileUploadException extends
*/
public FileUploadException(String message, Throwable cause)
{
- super(message, cause);
+ super(message);
+ initCause(cause);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java?rev=1040734&r1=1040733&r2=1040734&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUpload.java Tue Nov 30 19:48:44 2010
@@ -222,28 +222,6 @@ public class FileUpload implements IClus
}
/**
- * Saves this file upload to a given file on the server side.
- *
- * @param file
- * The file
- * @param bufSize
- * The memory buffer size
- * @throws IOException
- */
- public void writeTo(final File file, final int bufSize) throws IOException
- {
- InputStream is = getInputStream();
- try
- {
- Files.writeTo(file, is, bufSize);
- }
- finally
- {
- is.close();
- }
- }
-
- /**
* Convenience method that copies the input stream returned by {@link #getInputStream()} into a
* temporary file.
* <p>