svn commit: r1001285 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java

[mgrigorov]

Author: mgrigorov
Date: Sat Sep 25 17:48:17 2010
New Revision: 1001285

URL: http://svn.apache.org/viewvc?rev=1001285&view=rev
Log:
WICKET-3078 FileUploadException is masked behind WicketRuntimeException and not 
handled by a Form

Cleanup UploadWebRequest.


Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java?rev=1001285&r1=1001284&r2=1001285&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
 Sat Sep 25 17:48:17 2010
@@ -18,7 +18,6 @@ package org.apache.wicket.extensions.aja
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.request.Url;
@@ -43,31 +42,38 @@ import org.apache.wicket.util.upload.Fil
  */
 public class UploadWebRequest extends ServletWebRequest
 {
-       public UploadWebRequest(HttpServletRequest httpServletRequest, String 
filterPrefix, Url url)
-       {
-               super(httpServletRequest, filterPrefix, url);
-       }
 
+       /**
+        * Construct.
+        * 
+        * @param httpServletRequest
+        * @param filterPrefix
+        */
        public UploadWebRequest(HttpServletRequest httpServletRequest, String 
filterPrefix)
        {
-               super(httpServletRequest, filterPrefix);
+               this(httpServletRequest, filterPrefix, null);
        }
 
+       /**
+        * Construct.
+        * 
+        * @param httpServletRequest
+        * @param filterPrefix
+        * @param url
+        */
+       public UploadWebRequest(HttpServletRequest httpServletRequest, String 
filterPrefix, Url url)
+       {
+               super(httpServletRequest, filterPrefix, url);
+       }
 
        /**
-        * @see 
org.apache.wicket.request.http.WebRequest#newMultipartWebRequest(org.apache.wicket.util.lang.Bytes)
+        * @see 
org.apache.wicket.protocol.http.servlet.ServletWebRequest#newMultipartWebRequest(org.apache.wicket.util.lang.Bytes)
         */
        @Override
        public MultipartServletWebRequest newMultipartWebRequest(Bytes maxsize)
+               throws FileUploadException
        {
-               try
-               {
-                       return new MultipartRequest(getHttpServletRequest(), 
getFilterPrefix(), maxsize);
-               }
-               catch (FileUploadException e)
-               {
-                       throw new WicketRuntimeException(e);
-               }
+               return new MultipartRequest(getHttpServletRequest(), 
getFilterPrefix(), maxsize);
        }
 
        private static final String SESSION_KEY = 
UploadWebRequest.class.getName();