You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/09/04 15:42:55 UTC

[2/3] git commit: WICKET-5691 Wicket FileUploadField.getFileUploads() should never return null.

WICKET-5691 Wicket FileUploadField.getFileUploads() should never return null.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0da61bac
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0da61bac
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0da61bac

Branch: refs/heads/wicket-6.x
Commit: 0da61bac1ce17a4b1723027042e61cb0c4b0ac9d
Parents: d14ee45
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Sep 4 09:18:44 2014 +0300
Committer: adelbene <an...@gmail.com>
Committed: Thu Sep 4 15:37:02 2014 +0200

----------------------------------------------------------------------
 .../wicket/markup/html/form/upload/FileUploadField.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/0da61bac/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
index 89c5913..40a22a0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
@@ -77,7 +77,7 @@ public class FileUploadField extends FormComponent<List<FileUpload>>
 	{
 		List<FileUpload> fileUploads = getFileUploads();
 
-		return (fileUploads != null && !fileUploads.isEmpty()) ? fileUploads.get(0) : null;
+		return fileUploads.isEmpty() ? null : fileUploads.get(0) ;
 	}
 
 	/**
@@ -95,7 +95,7 @@ public class FileUploadField extends FormComponent<List<FileUpload>>
 			return fileUploads;
 		}
 
-		fileUploads = new ArrayList<FileUpload>();
+		fileUploads = new ArrayList<>();
 
 		// Get request
 		final Request request = getRequest();
@@ -142,9 +142,9 @@ public class FileUploadField extends FormComponent<List<FileUpload>>
 	public String[] getInputAsArray()
 	{
 		List<FileUpload> fileUploads = getFileUploads();
-		if (fileUploads != null)
+		if (fileUploads.isEmpty() == false)
 		{
-			List<String> clientFileNames = new ArrayList<String>();
+			List<String> clientFileNames = new ArrayList<>();
 			for (FileUpload fu : fileUploads)
 			{
 				clientFileNames.add(fu.getClientFileName());