turner 2003/01/19 22:28:37
Modified: validator/src/share/org/apache/commons/validator
GenericValidator.java
validator/src/test/org/apache/commons/validator
EmailTest.java
Log:
Fixes bug 15898
Dots at the end of domain names
Revision Changes Path
1.9 +9 -4
jakarta-commons/validator/src/share/org/apache/commons/validator/GenericValidator.java
Index: GenericValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/GenericValidator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GenericValidator.java 16 Oct 2002 22:17:31 -0000 1.8
+++ GenericValidator.java 20 Jan 2003 06:28:37 -0000 1.9
@@ -424,8 +424,13 @@
// Check the whole email address structure
bValid = matchEmailPat.match(emailPat, value);
+ if (value.endsWith(".")) {
+ bValid = false;
+ }
+
// Check the user component of the email address
if (bValid) {
+
String user = matchEmailPat.group(1);
// See if "user" is valid
1.5 +17 -4
jakarta-commons/validator/src/test/org/apache/commons/validator/EmailTest.java
Index: EmailTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/EmailTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmailTest.java 15 Dec 2002 21:46:41 -0000 1.4
+++ EmailTest.java 20 Jan 2003 06:28:37 -0000 1.5
@@ -200,6 +200,19 @@
}
/**
+ * <p>Tests the e-mail validation with a dot at the end of
+ * the address.</p>
+ */
+ public void testEmailWithDotEnd() throws ValidatorException {
+ // Create bean to run test on.
+ ValueBean info = new ValueBean();
+
+ info.setValue("[EMAIL PROTECTED]");
+ valueTest(info, false);
+
+ }
+
+ /**
* Utlity class to run a test on a value.
*
* @param info Value to run test on.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
