From 58f3b9f8d1fc6d0f95d5289b3f0242d8284a69aa Mon Sep 17 00:00:00 2001 From: MinaR Date: Wed, 23 Apr 2025 09:59:30 +0200 Subject: [PATCH] sistemato errore Primary database not present yet --- .../ems/sync/MultiDBTransaction/BasicConnectionPool.java | 6 +++++- .../ems/production/service/MesProductionServiceV2.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java b/ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java index 7e3cc830cb..e5a0459e7a 100644 --- a/ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java +++ b/ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/BasicConnectionPool.java @@ -129,13 +129,17 @@ public class BasicConnectionPool { // poolLock.lock(); try { - if (!connectionPool.containsKey(dbName) || connectionPool.get(dbName).isEmpty()) { + if (!connectionPool.containsKey(dbName)) { return createExtraConnection(profileName); } List pool = connectionPool.get(dbName); List used = usedConnections.get(dbName); + if( pool.isEmpty() ) { + return createExtraConnection(profileName); + } + DataSource ds = pool.remove(0); if (ds.isClosed()) { diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java index d1a6304120..a766ed3419 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java +++ b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java @@ -907,7 +907,7 @@ public class MesProductionServiceV2 { String key = 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)) { ObjectMapper mapper = new ObjectMapper();