fix for GRAILS-2669

git-svn-id: https://svn.codehaus.org/grails/trunk@6815 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/commons/org/codehaus/groovy/grails/validation/EmailConstraint.java

@@ -14,8 +14,9 @@
  */
 package org.codehaus.groovy.grails.validation;
 
-import org.springframework.validation.Errors;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.validator.EmailValidator;
+import org.springframework.validation.Errors;
 
 /**
  * A Constraint that validates an email address
@@ -57,7 +58,9 @@ protected void processValidate(Object target, Object propertyValue, Errors error
         if(email) {
             EmailValidator emailValidator = EmailValidator.getInstance();
             Object[] args = new Object[] { constraintPropertyName, constraintOwningClass, propertyValue };
-            if(!emailValidator.isValid(propertyValue.toString())  ) {
+            String value = propertyValue.toString();
+            if(StringUtils.isBlank(value))return;
+            if(!emailValidator.isValid(value)  ) {
                 super.rejectValue(target,errors,ConstrainedProperty.DEFAULT_INVALID_EMAIL_MESSAGE_CODE,ConstrainedProperty.EMAIL_CONSTRAINT + ConstrainedProperty.INVALID_SUFFIX,args);
             }
         }

test/commons/org/codehaus/groovy/grails/validation/EmailConstraintTests.java

@@ -24,11 +24,6 @@ public void testValidation() {
                 "[email protected]"
         );
 
-        // must always pass for null value
-        testConstraintPassed(
-                getConstraint( "testString", Boolean.TRUE),
-                null
-        );
 
         testConstraintDefaultMessage(
                 getConstraint( "testString", Boolean.TRUE ),
@@ -38,6 +33,22 @@ public void testValidation() {
 
     }
 
+    public void testNullValue() {
+        // must always pass for null value
+        testConstraintPassed(
+                getConstraint( "testString", Boolean.TRUE),
+                null
+        );
+    }
+
+    public void testBlankString() {
+        // must always pass for blank value
+        testConstraintPassed(
+                getConstraint( "testString", Boolean.TRUE),
+                ""
+        );
+    }
+
 
     public void testCreation() {
         EmailConstraint constraint = new EmailConstraint();