HHH-17734 Ensure provider_class has precedence over datasource

beikov · sebersole · commit 3700bbf4f06e · 2024-03-28T14:38:34.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
@@ -104,10 +104,6 @@ public ConnectionProvider initiateService(
 			return null;
 		}
 
-		if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {
-			return new DatasourceConnectionProviderImpl();
-		}
-
 		final StrategySelector strategySelector = registry.getService( StrategySelector.class );
 		final Object explicitSetting = configurationValues.get( AvailableSettings.CONNECTION_PROVIDER );
 		if ( explicitSetting != null ) {
@@ -150,6 +146,10 @@ else if ( explicitSetting instanceof Class ) {
 			}
 		}
 
+		if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {
+			return new DatasourceConnectionProviderImpl();
+		}
+
 		ConnectionProvider connectionProvider = null;
 
 		final Class<? extends ConnectionProvider> singleRegisteredProvider = getSingleRegisteredProvider(

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,6 @@ public ConnectionProvider initiateService(`
`104`	`104`	`return null;`
`105`	`105`	`}`
`106`	`106`
`107`		`- if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {`
`108`		`- return new DatasourceConnectionProviderImpl();`
`109`		`- }`
`110`		`-`
`111`	`107`	`final StrategySelector strategySelector = registry.getService( StrategySelector.class );`
`112`	`108`	`final Object explicitSetting = configurationValues.get( AvailableSettings.CONNECTION_PROVIDER );`
`113`	`109`	`if ( explicitSetting != null ) {`
`@@ -150,6 +146,10 @@ else if ( explicitSetting instanceof Class ) {`
`150`	`146`	`}`
`151`	`147`	`}`
`152`	`148`
	`149`	`+ if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {`
	`150`	`+ return new DatasourceConnectionProviderImpl();`
	`151`	`+ }`
	`152`	`+`
`153`	`153`	`ConnectionProvider connectionProvider = null;`
`154`	`154`
`155`	`155`	`final Class<? extends ConnectionProvider> singleRegisteredProvider = getSingleRegisteredProvider(`