Author: remy.maucherat(a)jboss.com
Date: 2010-10-25 04:24:25 -0400 (Mon, 25 Oct 2010)
New Revision: 1565
Modified:
trunk/java/org/apache/catalina/connector/Request.java
Log:
- JBWEB-187: Avoid NPE since the "flag" is set too late.
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2010-10-19 11:59:15 UTC (rev
1564)
+++ trunk/java/org/apache/catalina/connector/Request.java 2010-10-25 08:24:25 UTC (rev
1565)
@@ -57,6 +57,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -2874,6 +2875,8 @@
protected void parseMultipart()
throws IOException, ServletException {
+ parts = Collections.emptyMap();
+
if (context == null)
return;