svn commit: r589595 - /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java

[ma...@apache.org]

Author: matzew
Date: Mon Oct 29 05:17:18 2007
New Revision: 589595

URL: http://svn.apache.org/viewvc?rev=589595&view=rev
Log:
TRINIDAD-788 - don't upload empty files, trigger as no file provided

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java?rev=589595&r1=589594&r2=589595&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputFileRenderer.java Mon Oct 29 05:17:18 2007
@@ -26,6 +26,7 @@
 import org.apache.myfaces.trinidad.component.core.input.CoreInputFile;
 
 import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.model.UploadedFile;
 import org.apache.myfaces.trinidadinternal.config.upload.UploadedFiles;
 
 /**
@@ -56,18 +57,21 @@
     detectAutoSubmit(context, component, clientId);
 
     Object result = null;
+    UploadedFile file = null;
 
     UploadedFiles files = UploadedFiles.getUploadedFiles(context);
     if (files != null)
     {
-      result = files.getUploadedFile(clientId);
+      file = files.getUploadedFile(clientId);
     }
 
-    // If we couldn't find a file, return "FALSE" to indicate that
-    // the file upload *was* available, but didn't upload anything
+    // If we couldn't find a file (or the file is empty), return "FALSE" to indicate that
+    // the file upload *was* available, but didn't upload a file
     // this time.
-    if (result == null)
+    if (file == null || file.getLength() == 0)
       result = Boolean.FALSE;
+    else
+      result = file;
 
     return result;
   }