Author: pero
Date: Fri Apr 30 11:25:10 2010
New Revision: 939639
URL: http://svn.apache.org/viewvc?rev=939639&view=rev
Log:
Fix NPE if no encoding parameter exists at request!
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=939639&r1=939638&r2=939639&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Apr 30
11:25:10 2010
@@ -2513,9 +2513,13 @@ public class Request
parts.add(part);
if (part.getFilename() == null) {
try {
- parameters.addParameterValues(part.getName(),
+ String encoding = parameters.getEncoding();
+ if(encoding == null) {
+ encoding = Parameters.DEFAULT_ENCODING;
+ }
+
parameters.addParameterValues(part.getName(),
new String[] {part.getString(
- parameters.getEncoding())});
+ encoding)});
} catch (UnsupportedEncodingException uee) {
try {
parameters.addParameterValues(part.getName(),
@@ -2533,7 +2537,7 @@ public class Request
} catch (FileUploadBase.SizeException e) {
partsParseException = new IllegalStateException(e);
} catch (FileUploadException e) {
- partsParseException = new IOException();
+ partsParseException = new IOException(e);
}
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
