From 3700bbf4f06e23a997d7ef156012c08389337d3c Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Wed, 21 Feb 2024 18:27:21 +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 f14c04cb96..3dd388a773 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
@@ -104,10 +104,6 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
 			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 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
 			}
 		}
 
+		if ( configurationValues.get( AvailableSettings.DATASOURCE ) != null ) {
+			return new DatasourceConnectionProviderImpl();
+		}
+
 		ConnectionProvider connectionProvider = null;
 
 		final Class<? extends ConnectionProvider> singleRegisteredProvider = getSingleRegisteredProvider(