364283 can't parse the servlet multipart-config for the web.xml

This commit is contained in:
Jan Bartel 2011-11-22 12:17:07 +11:00
parent 0e9449ac85
commit 837f8d33c4
1 changed files with 4 additions and 4 deletions

View File

@ -554,10 +554,10 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
XmlParser.Node multipart = node.get("multipart-config"); XmlParser.Node multipart = node.get("multipart-config");
if (multipart != null) if (multipart != null)
{ {
String location = node.getString("location", false, true); String location = multipart.getString("location", false, true);
String maxFile = node.getString("max-file-size", false, true); String maxFile = multipart.getString("max-file-size", false, true);
String maxRequest = node.getString("max-request-size", false, true); String maxRequest = multipart.getString("max-request-size", false, true);
String threshold = node.getString("file-size-threshold",false,true); String threshold = multipart.getString("file-size-threshold",false,true);
MultipartConfigElement element = new MultipartConfigElement(location, MultipartConfigElement element = new MultipartConfigElement(location,
(maxFile==null||"".equals(maxFile)?-1L:Long.parseLong(maxFile)), (maxFile==null||"".equals(maxFile)?-1L:Long.parseLong(maxFile)),
(maxRequest==null||"".equals(maxRequest)?-1L:Long.parseLong(maxRequest)), (maxRequest==null||"".equals(maxRequest)?-1L:Long.parseLong(maxRequest)),