svn commit: r739691 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

[ivaynberg]

Author: ivaynberg
Date: Sun Feb  1 03:30:42 2009
New Revision: 739691

URL: http://svn.apache.org/viewvc?rev=739691&view=rev
Log:
WICKET-1995

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=739691&r1=739690&r2=739691&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 Sun Feb  1 03:30:42 2009
@@ -1163,15 +1163,16 @@
                if (isValid())
                {
                        convertInput();
-
-                       if (isValid() && isRequired() && getConvertedInput() == 
null && isInputNullable())
-                       {
-                               reportRequiredError();
-                       }
-
                        if (isValid())
                        {
-                               validateValidators();
+                               if (isRequired() && getConvertedInput() == null 
&& isInputNullable())
+                               {
+                                       reportRequiredError();
+                               }
+                               else
+                               {
+                                       validateValidators();
+                               }
                        }
                }
        }