Revert "Reuse the logic that checks a http request for multipart content"
This reverts commit 5468b0fbb16cdfbe06761d758e291ea02e9f744e. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c9c1e49d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c9c1e49d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c9c1e49d Branch: refs/heads/master Commit: c9c1e49dc09c5cbdf30ba3db04fab59ef58ac019 Parents: bade762 Author: svenmeier <[email protected]> Authored: Mon Oct 1 08:17:07 2012 +0200 Committer: svenmeier <[email protected]> Committed: Mon Oct 1 08:17:07 2012 +0200 ---------------------------------------------------------------------- .../wicket/protocol/http/WebApplication.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c9c1e49d/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java index 6e638cf..117947d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java @@ -44,6 +44,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.AutoLabelResolver; import org.apache.wicket.markup.html.form.AutoLabelTextResolver; +import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.pages.AccessDeniedPage; import org.apache.wicket.markup.html.pages.InternalErrorPage; import org.apache.wicket.markup.html.pages.PageExpiredErrorPage; @@ -80,7 +81,6 @@ import org.apache.wicket.util.lang.PackageName; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.time.Duration; import org.apache.wicket.util.upload.FileUploadException; -import org.apache.wicket.util.upload.ServletFileUpload; import org.apache.wicket.util.watch.IModificationWatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -488,7 +488,11 @@ public abstract class WebApplication extends Application WebRequest webRequest = newWebRequest(servletRequest, filterPath); - if (ServletFileUpload.isMultipartContent(servletRequest)) + String contentType = servletRequest.getContentType(); + String method = servletRequest.getMethod(); + + if (webRequest instanceof ServletWebRequest && Form.METHOD_POST.equalsIgnoreCase(method) && + Strings.isEmpty(contentType) == false && contentType.toLowerCase().startsWith(Form.ENCTYPE_MULTIPART_FORM_DATA)) { try {
