Index: web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java
===================================================================
--- web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java	(revision 51512)
+++ web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java	(working copy)
@@ -57,6 +57,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import com.sun.grizzly.util.http.Parameters;
 
@@ -75,6 +77,9 @@
     private ArrayList<Part> parts;
     private List<Part> unmodifiableParts;
 
+    private static final Logger log =
+            Logger.getLogger(Multipart.class.getName());
+
     public Multipart(HttpServletRequest request, Parameters parameters,
                 String location, long maxFileSize, long maxRequestSize,
                 int fileSizeThreshold) {
@@ -96,6 +101,14 @@
         }
     }
 
+    public void init() {
+        try {
+            initParts();
+        } catch (Exception ex) {
+            log.severe("Error in multipart initialization.");
+        }
+    }
+
     public String getLocation() {
         return location;
     }
Index: web/web-core/src/main/java/org/apache/catalina/connector/Request.java
===================================================================
--- web/web-core/src/main/java/org/apache/catalina/connector/Request.java	(revision 51512)
+++ web/web-core/src/main/java/org/apache/catalina/connector/Request.java	(working copy)
@@ -3148,7 +3148,7 @@
             contentType = contentType.trim();
         }
         if ("multipart/form-data".equals(contentType)) {
-            getMultipart();
+            getMultipart().init();
         }
         if (!("application/x-www-form-urlencoded".equals(contentType))) {
             return;