Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -61,7 +61,7 @@ public class BasicConnectionPool {
|
||||
}
|
||||
}
|
||||
|
||||
private void initializeConnections() throws Exception {
|
||||
private void initializeConnections() {
|
||||
final List<AvailableConnectionsModel> availableConnections =
|
||||
settingsModel.getAvailableConnectionsWithoutDuplicatedProfiles(false);
|
||||
|
||||
@@ -111,15 +111,9 @@ public class BasicConnectionPool {
|
||||
|
||||
private void registerDataSourceIfNotExists(AvailableConnectionsModel connectionModel) throws Exception {
|
||||
String dbName = connectionModel.getDbName();
|
||||
registeredDatasources.computeIfAbsent(dbName, k -> {
|
||||
try {
|
||||
return createNewDataSource(connectionModel);
|
||||
} catch (Exception e) {
|
||||
logger.error("Errore creazione lazy DataSource per {}", dbName, e);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
if (!registeredDatasources.containsKey(dbName)) {
|
||||
registeredDatasources.put(dbName, createNewDataSource(connectionModel));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -52,11 +52,13 @@ public class MultiDBTransactionManager implements AutoCloseable {
|
||||
public MultiDBTransactionManager() {
|
||||
connectionPool = ApplicationContextProvider.getApplicationContext().getBean(BasicConnectionPool.class);
|
||||
settingsModel = ApplicationContextProvider.getApplicationContext().getBean(SettingsModel.class);
|
||||
emsDBConst = ApplicationContextProvider.getApplicationContext().getBean(EmsDBConst.class);
|
||||
}
|
||||
|
||||
public MultiDBTransactionManager(BasicConnectionPool connectionPool) throws Exception {
|
||||
this.connectionPool = connectionPool;
|
||||
settingsModel = ApplicationContextProvider.getApplicationContext().getBean(SettingsModel.class);
|
||||
emsDBConst = ApplicationContextProvider.getApplicationContext().getBean(EmsDBConst.class);
|
||||
}
|
||||
|
||||
public MultiDBTransactionManager(AvailableConnectionsModel connectionsModel) throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user