Repository: wicket Updated Branches: refs/heads/master 8f2a6d2c0 -> a3aa418c5
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/a11c0522 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a11c0522 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a11c0522 Branch: refs/heads/master Commit: a11c05229400f9d9401e2fec5aeaa7468da2c5f5 Parents: 8f2a6d2 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Sep 4 09:18:44 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Sep 4 09:18:44 2014 +0300 ---------------------------------------------------------------------- .../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/a11c0522/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 d5b85fd..a3ba037 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());
