You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/05/22 22:49:55 UTC

svn commit: r540747 - /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIFileInput.java

Author: bommel
Date: Tue May 22 13:49:54 2007
New Revision: 540747

URL: http://svn.apache.org/viewvc?view=rev&rev=540747
Log:
avoid possible ClassCastException

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIFileInput.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIFileInput.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIFileInput.java?view=diff&rev=540747&r1=540746&r2=540747
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIFileInput.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIFileInput.java Tue May 22 13:49:54 2007
@@ -26,8 +26,6 @@
 import javax.faces.application.FacesMessage;
 
 /*
- * Created by IntelliJ IDEA.
- * User: bommel
  * Date: 10.02.2006
  * Time: 19:02:13
  */
@@ -44,14 +42,23 @@
 
   public void validate(FacesContext facesContext) {
     if (isRequired()) {
-      FileItem file = (FileItem) getSubmittedValue();
-      if (file == null || file.getName().length() == 0) {
-        FacesMessage facesMessage = MessageFactory.createFacesMessage(
-            facesContext, REQUIRED_MESSAGE_ID, FacesMessage.SEVERITY_ERROR);
-        facesContext.addMessage(getClientId(facesContext), facesMessage);
+      if (getSubmittedValue() instanceof FileItem) {
+        FileItem file = (FileItem) getSubmittedValue();
+        if (file == null || file.getName().length() == 0) {
+          addErrorMessage(facesContext);
+          setValid(false);
+        }
+      } else {
+        addErrorMessage(facesContext);
         setValid(false);
       }
     }
     super.validate(facesContext);
+  }
+
+  private void addErrorMessage(FacesContext facesContext) {
+    FacesMessage facesMessage = MessageFactory.createFacesMessage(
+        facesContext, REQUIRED_MESSAGE_ID, FacesMessage.SEVERITY_ERROR);
+    facesContext.addMessage(getClientId(facesContext), facesMessage);
   }
 }