Merge branch 'master' into develop

ems-core/src/main/java/it/integry/ems/sync/MultiDBTransaction/MultiDBTransactionManager.java

@@ -181,12 +181,6 @@ public class MultiDBTransactionManager implements AutoCloseable {
         return connection.prepareStatement(sql);
     }
 
-    public PreparedStatement prepareStatementOnDistributore(String sql) throws Exception {
-        try (Connection connection = getDistributoreConnection()) {
-            return connection.prepareStatement(sql);
-        }
-    }
-
     public List<Connection> getActiveConnections() throws SQLException {
         return allConnections;
     }

ems-core/src/main/java/it/integry/ems/sync/SyncManager.java

@@ -81,6 +81,7 @@ public class SyncManager {
 
                 proceedSyncronization(entitySource, entityCloned, lastProfileUsed, multiDBTransactionManager);
 
+                distributoreConnection.commit();
             } catch (Exception e) {
 
                 String subscriptor = null;
@@ -104,6 +105,9 @@ public class SyncManager {
 
                     e = new SyncException(e, profileDb);
                 }
+
+                distributoreConnection.rollback();
+
                 throw e;
             }
         }