webwork/src/main/webwork/multipart PellMultiPartRequest.java,1.4,1.5

Update of /cvsroot/opensymphony/webwork/src/main/webwork/multipart
In directory sc8-pr-cvs1:/tmp/cvs-serv15380/src/main/webwork/multipart

Modified Files:
	PellMultiPartRequest.java 
Log Message:
Fix Pell Multipart parser to not die if size is larger than max size.

Fixes WW-426

Index: PellMultiPartRequest.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/multipart/PellMultiPartRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PellMultiPartRequest.java	9 May 2003 18:30:06 -0000	1.4
+++ PellMultiPartRequest.java	16 Dec 2003 22:05:04 -0000	1.5
@@ -9,6 +9,7 @@
 import org.apache.commons.logging.LogFactory;
 import webwork.config.Configuration;
 import http.utils.multipartrequest.ServletMultipartRequest;
+import http.utils.multipartrequest.MultipartRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
@@ -40,10 +41,9 @@
      */
     private String getEncoding()
     {
-        String encoding = null;
         try
         {
-            encoding = Configuration.getString("webwork.i18n.encoding");
+            String encoding = Configuration.getString("webwork.i18n.encoding");
             if (encoding != null)
             {
                 return encoding;
@@ -74,11 +74,11 @@
       }
       if(memoryUpload)
       {
-        multi = new ServletMultipartRequest(servletRequest, maxSize, getEncoding());
+        multi = new ServletMultipartRequest(servletRequest, maxSize, MultipartRequest.IGNORE_FILES_IF_MAX_BYES_EXCEEDED, getEncoding());
       }
       else
       {
-        multi = new ServletMultipartRequest(servletRequest, saveDir, maxSize, getEncoding());
+        multi = new ServletMultipartRequest(servletRequest, saveDir, maxSize, MultipartRequest.IGNORE_FILES_IF_MAX_BYES_EXCEEDED, getEncoding());
       }
     }
 




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click