From 837f8d33c4a7c243edc237175820f53624d912fe Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 22 Nov 2011 12:17:07 +1100 Subject: [PATCH] 364283 can't parse the servlet multipart-config for the web.xml --- .../eclipse/jetty/webapp/StandardDescriptorProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java index 32fb1378f58..13e359aab43 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java @@ -554,10 +554,10 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor XmlParser.Node multipart = node.get("multipart-config"); if (multipart != null) { - String location = node.getString("location", false, true); - String maxFile = node.getString("max-file-size", false, true); - String maxRequest = node.getString("max-request-size", false, true); - String threshold = node.getString("file-size-threshold",false,true); + String location = multipart.getString("location", false, true); + String maxFile = multipart.getString("max-file-size", false, true); + String maxRequest = multipart.getString("max-request-size", false, true); + String threshold = multipart.getString("file-size-threshold",false,true); MultipartConfigElement element = new MultipartConfigElement(location, (maxFile==null||"".equals(maxFile)?-1L:Long.parseLong(maxFile)), (maxRequest==null||"".equals(maxRequest)?-1L:Long.parseLong(maxRequest)),