[jbossweb-commits] JBossWeb SVN: r1727 - in branches/3.0.x: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2011-05-25 11:41:20 -0400 (Wed, 25 May 2011)
New Revision: 1727
Modified:
branches/3.0.x/java/org/apache/catalina/connector/Request.java
branches/3.0.x/webapps/docs/changelog.xml
Log:
- Port JBWEB-187 fix to avoid NPE.
Modified: branches/3.0.x/java/org/apache/catalina/connector/Request.java
===================================================================
--- branches/3.0.x/java/org/apache/catalina/connector/Request.java 2011-05-24 11:53:52 UTC
(rev 1726)
+++ branches/3.0.x/java/org/apache/catalina/connector/Request.java 2011-05-25 15:41:20 UTC
(rev 1727)
@@ -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;
Modified: branches/3.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/3.0.x/webapps/docs/changelog.xml 2011-05-24 11:53:52 UTC (rev 1726)
+++ branches/3.0.x/webapps/docs/changelog.xml 2011-05-25 15:41:20 UTC (rev 1727)
@@ -17,6 +17,13 @@
<body>
<section name="JBoss Web 3.0.0.CR2 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <jira>187</jira>: Fix NPE calling multipart parsing when a Servlet
has no multipart config. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>