Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6799 Add a SessionFactoryObserver to close ServiceRegistries created by the bootstrap process

This commit is contained in:
Emmanuel Bernard 2011-11-03 21:13:34 +01:00
parent f1813aec49
commit 19939cedf5
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
View File

@ -68,6 +68,7 @@ import org.hibernate.HibernateException;
import org.hibernate.Interceptor; import org.hibernate.Interceptor;
import org.hibernate.MappingException; import org.hibernate.MappingException;
import org.hibernate.MappingNotFoundException; import org.hibernate.MappingNotFoundException;
import org.hibernate.SessionFactory;
import org.hibernate.SessionFactoryObserver; import org.hibernate.SessionFactoryObserver;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
@ -92,6 +93,7 @@ import org.hibernate.engine.spi.FilterDefinition;
import org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory; import org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory;
import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory;
import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory; import org.hibernate.id.factory.spi.MutableIdentifierGeneratorFactory;
import org.hibernate.internal.SessionFactoryObserverChain;
import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.internal.util.collections.CollectionHelper;
@ -103,8 +105,9 @@ import org.hibernate.mapping.PersistentClass;
import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.internal.JACCConfiguration; import org.hibernate.secure.internal.JACCConfiguration;
import org.hibernate.service.BootstrapServiceRegistryBuilder; import org.hibernate.service.BootstrapServiceRegistryBuilder;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.ServiceRegistryBuilder;
import org.hibernate.service.internal.BootstrapServiceRegistryImpl; import org.hibernate.service.internal.StandardServiceRegistryImpl;
import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl; import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl;
/** /**
@ -898,18 +901,13 @@ public class Ejb3Configuration implements Serializable, Referenceable {
} }
try { try {
final ServiceRegistryBuilder serviceRegistryBuilder = new ServiceRegistryBuilder( final ServiceRegistry serviceRegistry = buildLifecycleControledServiceRegistry( builder );
builder.with( new JpaIntegrator() ).build()
);
serviceRegistryBuilder.applySettings( cfg.getProperties() );
configure( (Properties) null, null );
NamingHelper.bind( this );
return new EntityManagerFactoryImpl( return new EntityManagerFactoryImpl(
transactionType, transactionType,
discardOnClose, discardOnClose,
getSessionInterceptorClass( cfg.getProperties() ), getSessionInterceptorClass( cfg.getProperties() ),
cfg, cfg,
serviceRegistryBuilder.buildServiceRegistry() serviceRegistry
); );
} }
catch (HibernateException e) { catch (HibernateException e) {
@ -922,6 +920,36 @@ public class Ejb3Configuration implements Serializable, Referenceable {
} }
} }
private ServiceRegistry buildLifecycleControledServiceRegistry(BootstrapServiceRegistryBuilder builder) {
final ServiceRegistryBuilder serviceRegistryBuilder = new ServiceRegistryBuilder(
builder.with( new JpaIntegrator() ).build()
);
serviceRegistryBuilder.applySettings( cfg.getProperties() );
configure( (Properties ) null, null );
NamingHelper.bind( this );
final ServiceRegistry serviceRegistry = serviceRegistryBuilder.buildServiceRegistry();
SessionFactoryObserver serviceRegistryCloser = new SessionFactoryObserver() {
@Override
public void sessionFactoryCreated(SessionFactory factory) {
}
@Override
public void sessionFactoryClosed(SessionFactory factory) {
( ( StandardServiceRegistryImpl ) serviceRegistry ).destroy();
}
};
if ( cfg.getSessionFactoryObserver() != null ) {
SessionFactoryObserverChain aggregator = new SessionFactoryObserverChain();
aggregator.addObserver( cfg.getSessionFactoryObserver() );
aggregator.addObserver( serviceRegistryCloser );
cfg.setSessionFactoryObserver( aggregator );
}
else {
cfg.setSessionFactoryObserver( serviceRegistryCloser );
}
return serviceRegistry;
}
private Class getSessionInterceptorClass(Properties properties) { private Class getSessionInterceptorClass(Properties properties) {
String sessionInterceptorClassname = (String) properties.get( AvailableSettings.SESSION_INTERCEPTOR ); String sessionInterceptorClassname = (String) properties.get( AvailableSettings.SESSION_INTERCEPTOR );
if ( StringHelper.isNotEmpty( sessionInterceptorClassname ) ) { if ( StringHelper.isNotEmpty( sessionInterceptorClassname ) ) {