Author: hardy.ferentschik Date: 2010-06-01 08:16:12 -0400 (Tue, 01 Jun 2010) New Revision: 19640 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/bootstrap/ValidationTest.java Log: HV-328 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java 2010-06-01 11:52:20 UTC (rev 19639) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConfigurationImpl.java 2010-06-01 12:16:12 UTC (rev 19640) @@ -116,6 +116,9 @@ } public HibernateValidatorConfiguration addMapping(InputStream stream) { + if ( mapping == null ) { + throw new IllegalArgumentException( "The stream cannot be null." ); + } validationBootstrapParameters.mappings.add( stream ); return this; } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/bootstrap/ValidationTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/bootstrap/ValidationTest.java 2010-06-01 11:52:20 UTC (rev 19639) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/bootstrap/ValidationTest.java 2010-06-01 12:16:12 UTC (rev 19640) @@ -27,18 +27,19 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; +import org.hibernate.validator.HibernateValidator; +import org.hibernate.validator.HibernateValidatorConfiguration; import org.hibernate.validator.constraints.impl.NotNullValidator; import org.hibernate.validator.engine.ConfigurationImpl; import org.hibernate.validator.engine.ConstraintValidatorFactoryImpl; -import org.hibernate.validator.HibernateValidatorConfiguration; import org.hibernate.validator.engine.ValidatorFactoryImpl; -import org.hibernate.validator.HibernateValidator; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + /** * Tests the Bean Validation bootstrapping. * @@ -96,6 +97,16 @@ assertEquals( constraintViolations.size(), 0, "Wrong number of constraints" ); } + /** + * HV-328 + */ + @Test(expectedExceptions = IllegalArgumentException.class) + public void testNullInputStream() { + Configuration<?> configuration = Validation.byDefaultProvider().configure(); + configuration.addMapping( null ); + configuration.buildValidatorFactory(); + } + private void assertDefaultBuilderAndFactory(Configuration configuration) { assertNotNull( configuration ); assertTrue( configuration instanceof ConfigurationImpl );