diff --git a/ems-core/src/main/java/it/integry/ems/datasource/DataSource.java b/ems-core/src/main/java/it/integry/ems/datasource/DataSource.java
index fa73ca41d3..69d0321a1f 100644
--- a/ems-core/src/main/java/it/integry/ems/datasource/DataSource.java
+++ b/ems-core/src/main/java/it/integry/ems/datasource/DataSource.java
@@ -20,8 +20,9 @@ public class DataSource extends BasicDataSource {
 
     /**
      * Instanzia un nuovo datasource.
-     * @deprecated
-     * Il datasource non deve essere istanziato direttamente ma bisogna utilizzare il metodo {@link it.integry.ems.sync.MultiDBTransaction.BasicConnectionPool#getConnection(String)} per ottenere una connessione.
+     *
+     * @deprecated Il datasource non deve essere istanziato direttamente ma bisogna utilizzare il metodo
+     * {@link it.integry.ems.sync.MultiDBTransaction.BasicConnectionPool#getConnection(AvailableConnectionsModel)} per ottenere una connessione.
      */
     @Deprecated
     public DataSource() {
diff --git a/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java b/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java
index d0cfc67ef9..6aa12d99ed 100644
--- a/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java
+++ b/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java
@@ -10,9 +10,13 @@ public class UtilityDebug {
     private static final String INTEGRY_DOMAIN = "STUDIO-ML";
 
     public static boolean isDebugExecution() {
+        return isDebugExecution(null);
+    }
+
+    public static boolean isDebugExecution(Boolean returnValue) {
         //Controllo il dominio del PC attuale
         String domainName = System.getenv("USERDOMAIN");
-        return INTEGRY_DOMAIN.equalsIgnoreCase(domainName);
+        return returnValue != null ? returnValue : INTEGRY_DOMAIN.equalsIgnoreCase(domainName);
     }