Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-04-23 09:59:37 +02:00
parent 78310161bd 3a9636b537
commit 61b9f80c2f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java
View File

@@ -129,13 +129,17 @@ public class BasicConnectionPool {
// poolLock.lock(); // poolLock.lock();
try { try {
if (!connectionPool.containsKey(dbName) || connectionPool.get(dbName).isEmpty()) { if (!connectionPool.containsKey(dbName)) {
return createExtraConnection(profileName); return createExtraConnection(profileName);
} }
List<DataSource> pool = connectionPool.get(dbName); List<DataSource> pool = connectionPool.get(dbName);
List<DataSource> used = usedConnections.get(dbName); List<DataSource> used = usedConnections.get(dbName);
if( pool.isEmpty() ) {
return createExtraConnection(profileName);
}
DataSource ds = pool.remove(0); DataSource ds = pool.remove(0);
if (ds.isClosed()) { if (ds.isClosed()) {

2
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -907,7 +907,7 @@ public class MesProductionServiceV2 {
String key = codJfas; String key = codJfas;
if (!UtilityString.isNullOrEmpty(codJfas)) { if (!UtilityString.isNullOrEmpty(codJfas)) {
String setup = setupGest.getSetup(gestName, section, key); String setup = setupGest.getSetup(multiDBTransactionManager.getPrimaryConnection(), gestName, section, key);
if (!UtilityString.isNullOrEmpty(setup)) { if (!UtilityString.isNullOrEmpty(setup)) {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();