Merge pull request #707 from theo/lighthouse-1763-patch

[#1763] Check for empty uploads when binding File[]
playframework · Jan 12, 2014 · 9e64fb5 · 9e64fb5
2 parents 2a282b1 + 5ab555a
commit 9e64fb5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/framework/src/play/data/binding/types/FileArrayBinder.java b/framework/src/play/data/binding/types/FileArrayBinder.java
@@ -28,9 +28,11 @@ public File[] bind(String name, Annotation[] annotations, String value, Class ac
             if (uploads != null) {
                 for (Upload upload : uploads) {
                     if (upload.getFieldName().equals(value)) {
-                        File file = upload.asFile();
-                        if (file.length() > 0) {
-                            fileArray.add(file);
+                        if(upload.getSize() != null && upload.getSize() > 0) {
+                            File file = upload.asFile();
+                            if (file.length() > 0) {
+                                fileArray.add(file);
+                            }
                         }
                     }
                 }