fix for GRAILS-1938

git-svn-id: https://svn.codehaus.org/grails/trunk@6274 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/groovy/org/codehaus/groovy/grails/plugins/web/ControllersGrailsPlugin.groovy

@@ -44,6 +44,7 @@ import org.springframework.validation.BindException
 import org.springframework.validation.Errors
 import org.springframework.web.multipart.commons.CommonsMultipartResolver
 import org.springframework.web.servlet.ModelAndView
+import org.codehaus.groovy.grails.web.multipart.ContentLengthAwareCommonsMultipartResolver
 
 /**
 * A plug-in that handles the configuration of controllers for Grails
@@ -72,7 +73,7 @@ class ControllersGrailsPlugin {
         exceptionHandler(GrailsExceptionResolver) {
             exceptionMappings = ['java.lang.Exception': '/error']
         }
-        multipartResolver(CommonsMultipartResolver)
+        multipartResolver(ContentLengthAwareCommonsMultipartResolver)
         def urlMappings = [:]
         grailsUrlMappings(UrlMappingFactoryBean) {
             mappings = urlMappings

src/web/org/codehaus/groovy/grails/web/multipart/ContentLengthAwareCommonsMultipartResolver.java

@@ -0,0 +1,52 @@
+/* Copyright 2004-2005 Graeme Rocher
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.web.multipart;
+
+import org.apache.commons.fileupload.FileUploadBase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.multipart.MultipartException;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+
+/**
+ * Safari includes the multipart packet inside an HTTP redirect without the Content-Length header. This causes
+ * CommonsMultipartResolver to blow up. We extend it here to catch this exception, printing a warning.
+ * 
+ * @author Graeme Rocher
+ * @since 1.0
+ *        <p/>
+ *        Created: Dec 7, 2007
+ */
+public class ContentLengthAwareCommonsMultipartResolver extends CommonsMultipartResolver {
+
+    static final Log LOG = LogFactory.getLog(ContentLengthAwareCommonsMultipartResolver.class );
+
+    protected MultipartParsingResult parseRequest(HttpServletRequest request) throws MultipartException {
+        try {
+            return super.parseRequest(request);
+        } catch (MultipartException e) {
+            if(e.getCause() != null && e.getCause().getClass().equals(FileUploadBase.UnknownSizeException.class)) {
+                LOG.warn(e.getMessage() );
+                return new MultipartParsingResult(Collections.EMPTY_MAP,Collections.EMPTY_MAP);
+            }
+            else {
+                throw e;
+            }
+        }
+    }
+}