Merge branch '3.10' of https://github.com/JumpMind/symmetric-ds.git i…

…nto 3.10
JumpMind · Feb 20, 2019 · 06c7fa7 · 06c7fa7
2 parents 3f083c5 + 8effd83
commit 06c7fa7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbFill.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DbFill.java
@@ -715,6 +715,10 @@ private void insertRandomRecord(ISqlTransaction tran, Table table) {
                     count = tran.prepareAndExecute(insertStatement.getSql(), insertStatement.getValueArray(row.toArray(table.getColumnNames()), 
                         row.toArray(table.getPrimaryKeyColumnNames())));
                 } catch(SqlException e) {
+                    log.warn(e.getMessage());
+                    if(platform.getDatabaseInfo().isRequiresSavePointsInTransaction()) {
+                        tran.rollback();
+                    }
                     count = 0;
                 }
             }