svn commit: r613513 - /struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java

[jm...@apache.org]

Author: jmitchell
Date: Sat Jan 19 22:45:09 2008
New Revision: 613513

URL: http://svn.apache.org/viewvc?rev=613513&view=rev
Log:
WW-2094 File upload - maximum size valida...

Modified:
    struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java

Modified: struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=613513&r1=613512&r2=613513&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java (original)
+++ struts/struts2/trunk/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java Sat Jan 19 22:45:09 2008
@@ -49,17 +49,24 @@
     private ServletMultipartRequest multi;
 
     private String defaultEncoding;
+    private boolean maxSizeProvided;
+    private int maxSize;
     
     @Inject(StrutsConstants.STRUTS_I18N_ENCODING)
     public void setDefaultEncoding(String enc) {
         this.defaultEncoding = enc;
     }
     
+    @Inject(StrutsConstants.STRUTS_MULTIPART_MAXSIZE)
+    public void setMaxSize(String maxSize) {
+    	this.maxSizeProvided = true;
+        this.maxSize = Integer.parseInt(maxSize);
+    }
+    
     /**
      * Creates a new request wrapper to handle multi-part data using methods adapted from Jason Pell's
      * multipart classes (see class description).
      *
-     * @param maxSize        maximum size post allowed
      * @param saveDir        the directory to save off the file
      * @param servletRequest the request containing the multipart
      */
@@ -68,7 +75,11 @@
         //calling the constructor.  See javadoc for MultipartRequest.setEncoding().
         synchronized (this) {
             setEncoding();
-            multi = new ServletMultipartRequest(servletRequest, saveDir);
+            if (maxSizeProvided){
+            	multi = new ServletMultipartRequest(servletRequest, saveDir, maxSize);
+            }else{
+            	multi = new ServletMultipartRequest(servletRequest, saveDir);
+            }
         }
     }