Skip to content

HHH-18685 - Proposed solution to enhancement for subclasses of HikariCPConnectionProvider which have already created the HikariDataSource #9048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

HHH-18685 - Proposed solution to enhancement for subclasses of HikariCPConnectionProvider which have already created the HikariDataSource #9048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...te-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,21 @@ public void configure(Map<String, Object> props) throws HibernateException {
ConnectionInfoLogger.INSTANCE.configureConnectionPool( "HikariCP" );

hcfg = HikariConfigurationUtil.loadConfiguration( props );
hds = new HikariDataSource( hcfg );

boolean initializedHikariDataSource = false;

// Support a HikariDataSource already configured by classes which extend this class
if(props.containsKey("HikariDataSource")) {
Object ohds = props.get("HikariDataSource");
if(ohds instanceof HikariDataSource) {
hds = (HikariDataSource) ohds;
initializedHikariDataSource = true;
}
}
if(!initializedHikariDataSource) {
// Default logic if no subclass has configured a HikariDataSource, do so now
hds = new HikariDataSource( hcfg );
}
}
catch (Exception e) {
ConnectionInfoLogger.INSTANCE.unableToInstantiateConnectionPool( e );
Expand Down
Loading