You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/09/25 17:41:28 UTC
svn commit: r1001242 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket:
markup/html/form/Form.java protocol/http/servlet/ServletWebRequest.java
Author: mgrigorov
Date: Sat Sep 25 15:41:27 2010
New Revision: 1001242
URL: http://svn.apache.org/viewvc?rev=1001242&view=rev
Log:
WICKET-3078 FileUploadException is masked behind WicketRuntimeException and not handled by a Form
Merge the code from 1.4.x that handles FileUploadException$SizeLimitException.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1001242&r1=1001241&r2=1001242&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Sat Sep 25 15:41:27 2010
@@ -1358,8 +1358,15 @@ public class Form<T> extends WebMarkupCo
// TODO: Can't this be detected from header?
getRequestCycle().setRequest(multipartWebRequest);
}
- catch (FileUploadException e)
+ catch (WicketRuntimeException wre)
{
+ if (wre.getCause() == null || !(wre.getCause() instanceof FileUploadException))
+ {
+ throw wre;
+ }
+
+ FileUploadException e = (FileUploadException)wre.getCause();
+
// Create model with exception and maximum size values
final Map<String, Object> model = new HashMap<String, Object>();
model.put("exception", e);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=1001242&r1=1001241&r2=1001242&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Sat Sep 25 15:41:27 2010
@@ -332,7 +332,6 @@ public class ServletWebRequest extends W
* @throws FileUploadException
*/
public MultipartServletWebRequest newMultipartWebRequest(Bytes maxSize)
- throws FileUploadException
{
return new MultipartServletWebRequestImpl(getHttpServletRequest(), filterPrefix, maxSize);
}