minor: don't pass the uninitialized SessionFactoryImpl to FastSessionServices

Author: gavinking

hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java

@@ -5,12 +5,12 @@
 package org.hibernate.internal;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
+import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.event.monitor.internal.EmptyEventMonitor;
 import org.hibernate.event.monitor.spi.EventMonitor;
 import org.hibernate.event.spi.EntityCopyObserverFactory;
@@ -42,7 +42,7 @@
  *
  * @author Sanne Grinovero
  */
-public final class FastSessionServices extends EventListenerGroups {
+public class FastSessionServices extends EventListenerGroups {
 
 	private final ConnectionProvider connectionProvider;
 	private final MultiTenantConnectionProvider<Object> multiTenantConnectionProvider;
@@ -57,9 +57,8 @@ public final class FastSessionServices extends EventListenerGroups {
 	private final ManagedBeanRegistry managedBeanRegistry;
 	private final ConfigurationService configurationService;
 
-	FastSessionServices(SessionFactoryImplementor sessionFactory) {
-		super( sessionFactory.getServiceRegistry() );
-		final ServiceRegistry serviceRegistry = sessionFactory.getServiceRegistry();
+	FastSessionServices(ServiceRegistry serviceRegistry, SessionFactoryOptions factoryOptions) {
+		super( serviceRegistry );
 
 		//Some "hot" services:
 		classLoaderService = serviceRegistry.requireService( ClassLoaderService.class );
@@ -72,7 +71,7 @@ public final class FastSessionServices extends EventListenerGroups {
 		managedBeanRegistry = serviceRegistry.getService( ManagedBeanRegistry.class );
 		configurationService = serviceRegistry.getService( ConfigurationService.class );
 
-		final boolean multiTenancyEnabled = sessionFactory.getSessionFactoryOptions().isMultiTenancyEnabled();
+		final boolean multiTenancyEnabled = factoryOptions.isMultiTenancyEnabled();
 		connectionProvider =
 				multiTenancyEnabled ? null : serviceRegistry.getService( ConnectionProvider.class );
 		multiTenantConnectionProvider =

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -284,7 +284,7 @@ public SessionFactoryImpl(
 			runtimeMetamodels = runtimeMetamodelsImpl;
 			final MappingMetamodelImpl mappingMetamodelImpl = new MappingMetamodelImpl( typeConfiguration, serviceRegistry );
 			runtimeMetamodelsImpl.setMappingMetamodel( mappingMetamodelImpl );
-			fastSessionServices = new FastSessionServices( this );
+			fastSessionServices = new FastSessionServices( serviceRegistry, sessionFactoryOptions );
 			mappingMetamodelImpl.finishInitialization(
 					new ModelCreationContext( bootstrapContext, bootMetamodel, mappingMetamodelImpl, typeConfiguration ) );
 			runtimeMetamodelsImpl.setJpaMetamodel( mappingMetamodelImpl.getJpaMetamodel() );
@@ -317,7 +317,7 @@ public SessionFactoryImpl(
 				close();
 			}
 			catch (Exception closeException) {
-				LOG.debugf( "Eating error closing the SessionFactory after a failed attempt to start it" );
+				LOG.debug( "Eating error closing the SessionFactory after a failed attempt to start it" );
 			}
 			throw e;
 		}
@@ -342,7 +342,7 @@ private static SessionFactoryServiceRegistry getServiceRegistry(
 			SessionFactoryImplementor self) {
 		return options.getServiceRegistry()
 				.requireService( SessionFactoryServiceRegistryFactory.class )
-				// it is not great how we pass in an instance to
+				// it is not great how we pass a reference to
 				// an incompletely-initialized instance here:
 				.buildServiceRegistry( self, options );
 	}

hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryFactoryImpl.java

@@ -29,10 +29,13 @@ public SessionFactoryServiceRegistryFactoryImpl(ServiceRegistryImplementor theBa
 	public SessionFactoryServiceRegistry buildServiceRegistry(
 			SessionFactoryImplementor sessionFactory,
 			SessionFactoryOptions options) {
-		final ClassLoaderService cls = options.getServiceRegistry().requireService( ClassLoaderService.class );
-		final SessionFactoryServiceRegistryBuilderImpl builder = new SessionFactoryServiceRegistryBuilderImpl( theBasicServiceRegistry );
+		final ClassLoaderService classLoaderService =
+				options.getServiceRegistry().requireService( ClassLoaderService.class );
+		final SessionFactoryServiceRegistryBuilderImpl builder =
+				new SessionFactoryServiceRegistryBuilderImpl( theBasicServiceRegistry );
 
-		for ( SessionFactoryServiceContributor contributor : cls.loadJavaServices( SessionFactoryServiceContributor.class ) ) {
+		for ( SessionFactoryServiceContributor contributor :
+				classLoaderService.loadJavaServices( SessionFactoryServiceContributor.class ) ) {
 			contributor.contribute( builder );
 		}
 

hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java

@@ -50,7 +50,8 @@ public static SessionFactoryServiceRegistryImpl create(
 			List<ProvidedService<?>> providedServices,
 			SessionFactoryImplementor sessionFactory,
 			SessionFactoryOptions sessionFactoryOptions) {
-		SessionFactoryServiceRegistryImpl instance = new SessionFactoryServiceRegistryImpl( parent, sessionFactory, sessionFactoryOptions);
+		final SessionFactoryServiceRegistryImpl instance =
+				new SessionFactoryServiceRegistryImpl( parent, sessionFactory, sessionFactoryOptions );
 		instance.initialize( initiators, providedServices );
 		return instance;
 	}