You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/11/14 13:46:46 UTC

[2/2] wicket git commit: WICKET-6002 FileUploadField makes form-component models become null on submit

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/e8faee17
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e8faee17
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e8faee17

Branch: refs/heads/wicket-7.x
Commit: e8faee175f6e394a14f36203d4b049e4a3c51ebd
Parents: 1c44a3b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 14 13:43:47 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 14 13:45:22 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/e8faee17/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