[hibernate-commits] Hibernate SVN: r16331 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-04-14 13:02:18 -0400 (Tue, 14 Apr 2009)
New Revision: 16331

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java
Log:
Fixed problem when there is no validation.xml at all.

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java	2009-04-14 16:43:33 UTC (rev 16330)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ConfigurationImpl.java	2009-04-14 17:02:18 UTC (rev 16331)
@@ -199,19 +199,16 @@
 		}
 
 		ValidationConfigType config = getValidationConfig();
-		if ( config == null ) {
-			return;
-		}
-
-		// collect the paramters from the xml file
 		ParameterHolder xmlParameters = new ParameterHolder();
-		setProviderClassFromXml( config, xmlParameters );
-		setMessageInterpolatorFromXml( config, xmlParameters );
-		setTraversableResolverFromXml( config, xmlParameters );
-		setConstraintFactoryFromXml( config, xmlParameters );
-		setMappingStreamsFromXml( config, xmlParameters );
-		setPropertiesFromXml( config, xmlParameters );
-
+		if ( config != null ) {
+			// collect the paramters from the xml file
+			setProviderClassFromXml( config, xmlParameters );
+			setMessageInterpolatorFromXml( config, xmlParameters );
+			setTraversableResolverFromXml( config, xmlParameters );
+			setConstraintFactoryFromXml( config, xmlParameters );
+			setMappingStreamsFromXml( config, xmlParameters );
+			setPropertiesFromXml( config, xmlParameters );
+		}
 		applyXmlSettings( xmlParameters );
 	}