fix ValidatorFactory2PhaseInjectionTest

hibernate · May 6, 2016 · 614d406 · 614d406
1 parent 7ce75e4
commit 614d406
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -226,6 +226,14 @@ public SessionFactoryImpl(final MetadataImplementor metadata, SessionFactoryOpti
 
 		this.properties = new HashMap<>();
 		this.properties.putAll( serviceRegistry.getService( ConfigurationService.class ).getSettings() );
+		if ( !properties.containsKey( AvailableSettings.JPA_VALIDATION_FACTORY ) ) {
+			if ( getSessionFactoryOptions().getValidatorFactoryReference() != null ) {
+				properties.put(
+						AvailableSettings.JPA_VALIDATION_FACTORY,
+						getSessionFactoryOptions().getValidatorFactoryReference()
+				);
+			}
+		}
 		maskOutSensitiveInformation(this.properties);
 		this.sqlFunctionRegistry = new SQLFunctionRegistry( jdbcServices.getJdbcEnvironment().getDialect(), options.getCustomSqlFunctionMap() );
 		this.cacheAccess = this.serviceRegistry.getService( CacheImplementor.class );