WICKET-6002 FileUploadField makes form-component models become null on submit
Use the Part's content type to decide whether it is a fileupload or standard form field. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d2db9578 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d2db9578 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d2db9578 Branch: refs/heads/lambdas Commit: d2db957866a8a24450c23dcb8c1fd27ec49c41ab Parents: 374865e Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Nov 14 13:43:47 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Nov 14 13:43:47 2015 +0100 ---------------------------------------------------------------------- .../wicket/protocol/http/servlet/ServletPartFileItem.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d2db9578/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java index c38de71..736927b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletPartFileItem.java @@ -43,6 +43,7 @@ class ServletPartFileItem implements FileItem * The adapted part */ private final Part part; + private final boolean isFormField; /** * Constructor @@ -51,6 +52,9 @@ class ServletPartFileItem implements FileItem { Args.notNull(part, "part"); this.part = part; + + String contentType = part.getContentType(); + this.isFormField = contentType == null; } @Override @@ -164,7 +168,7 @@ class ServletPartFileItem implements FileItem @Override public boolean isFormField() { - return false; + return isFormField; } @Override
