From 8a65536c4c053d42c27be5af24f7b6b5a402895f Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Wed, 21 Feb 2024 18:25:48 +0100
Subject: [PATCH] HHH-17734 Ensure provider_class has precedence over
 datasource

---
 .../connections/internal/ConnectionProviderInitiator.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
index f3819b43e6..27c8d6ca75 100644
--- 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
@@ -109,10 +109,6 @@ public ConnectionProvider initiateService(
 			return null;
 		}
 
-		if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {
-			return new DatasourceConnectionProviderImpl();
-		}
-
 		final StrategySelector strategySelector = registry.requireService( StrategySelector.class );
 		final Object explicitSetting = configurationValues.get( AvailableSettings.CONNECTION_PROVIDER );
 		if ( explicitSetting != null ) {
@@ -155,6 +151,10 @@ else if ( explicitSetting instanceof Class ) {
 			}
 		}
 
+		if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {
+			return new DatasourceConnectionProviderImpl();
+		}
+
 		ConnectionProvider connectionProvider = null;
 
 		final Class<? extends ConnectionProvider> singleRegisteredProvider = getSingleRegisteredProvider(