Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions javasource/databaseconnector/impl/JdbcConnectionManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public Connection getConnection(final String jdbcUrl, final String userName, fin
final Integer connPoolKey = toConnPoolKey(jdbcUrl, userName);
final HikariDataSource dataSource = connectionPool.computeIfAbsent(connPoolKey, k -> {
logNode.trace(String.format("Creating data source in connection pool for [url=%s, user=%s]", jdbcUrl, userName));
return createHikariDataSource(jdbcUrl, userName, password);
return createHikariDataSource(jdbcUrl, userName, password, connPoolKey);
});
logNode.trace(String.format("Getting connection from data source in connection pool for [url=%s, user=%s]", jdbcUrl, userName));
return dataSource.getConnection();
Expand All @@ -70,9 +70,9 @@ private Integer toConnPoolKey(final String jdbcUrl, final String userName) {
return (jdbcUrl + userName).hashCode();
}

private HikariDataSource createHikariDataSource(final String jdbcUrl, final String userName, final String password) {
private HikariDataSource createHikariDataSource(final String jdbcUrl, final String userName, final String password, Integer connPoolKey) {
final HikariDataSource dataSource = new HikariDataSource();

dataSource.setPoolName(String.format("MxDbConnector-HikaryCP-%d", connPoolKey));
dataSource.setJdbcUrl(jdbcUrl);
dataSource.setUsername(userName);
dataSource.setPassword(password);
Expand Down