HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager into hibernate-core (misc)

This commit is contained in:
Steve Ebersole 2016-05-02 10:10:34 -05:00
parent 614d406e8c
commit 4ad242799a
2 changed files with 3 additions and 3 deletions

View File

@ -435,8 +435,8 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
public Session openTemporarySession() throws HibernateException { public Session openTemporarySession() throws HibernateException {
return withOptions() return withOptions()
.autoClose( false ) .autoClose( false )
.flushBeforeCompletion( false ) .flushMode( FlushMode.MANUAL )
.connectionReleaseMode( ConnectionReleaseMode.AFTER_STATEMENT ) .connectionHandlingMode( PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT )
.openSession(); .openSession();
} }

View File

@ -201,7 +201,7 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil
metamodelBuilder.getMetadataBuildingOptions() metamodelBuilder.getMetadataBuildingOptions()
); );
withValidatorFactory( configurationValues.get( AvailableSettings.VALIDATION_FACTORY ) ); withValidatorFactory( configurationValues.get( org.hibernate.cfg.AvailableSettings.JPA_VALIDATION_FACTORY ) );
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// push back class transformation to the environment; for the time being this only has any effect in EE // push back class transformation to the environment; for the time being this only has any effect in EE