[hibernate-commits] Hibernate SVN: r19527 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/constraints/impl and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2010-05-17 08:47:14 -0400 (Mon, 17 May 2010)
New Revision: 19527

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java
Log:
HV-323

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java	2010-05-16 21:33:05 UTC (rev 19526)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/URLValidator.java	2010-05-17 12:47:14 UTC (rev 19527)
@@ -40,7 +40,7 @@
 	}
 
 	public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
-		if ( value == null ) {
+		if ( value == null || value.length() == 0 ) {
 			return true;
 		}
 

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java	2010-05-16 21:33:05 UTC (rev 19526)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/URLValidatorTest.java	2010-05-17 12:47:14 UTC (rev 19527)
@@ -41,7 +41,6 @@
 		validator.initialize( url );
 
 		assertTrue( validator.isValid( null, null ) );
-		assertFalse( validator.isValid( "", null ) );
 		assertFalse( validator.isValid( "http", null ) );
 		assertFalse( validator.isValid( "ftp//abc.de", null ) );
 		assertTrue( validator.isValid( "ftp://abc.de", null ) );
@@ -62,7 +61,7 @@
 		descriptor = new AnnotationDescriptor<URL>( URL.class );
 		descriptor.setValue( "protocol", "file" );
 		url = AnnotationFactory.create( descriptor );
-		validator = new URLValidator();                             
+		validator = new URLValidator();
 		validator.initialize( url );
 		assertFalse( validator.isValid( "http://abc.de", null ) );
 		assertTrue( validator.isValid( "file://Users/foobar/tmp", null ) );
@@ -105,4 +104,18 @@
 		assertFalse( validator.isValid( "ftp://www#hibernate#org:80", null ) );
 		assertTrue( validator.isValid( "http://www.hibernate.org:80", null ) );
 	}
+
+	@Test
+	public void testIsValidEmptyString() {
+		// HV-323
+		AnnotationDescriptor<URL> descriptor = new AnnotationDescriptor<URL>( URL.class );
+		descriptor.setValue( "protocol", "http" );
+		descriptor.setValue( "host", "www.hibernate.org" );
+		descriptor.setValue( "port", 80 );
+		URL url = AnnotationFactory.create( descriptor );
+		URLValidator validator = new URLValidator();
+		validator.initialize( url );
+
+		assertTrue( validator.isValid( "", null ) );
+	}
 }
\ No newline at end of file