0000945: batchCommit was being called for earlyCommit and for normal …

…commit. The api is suppose to only be call for a normal commit
JumpMind · Dec 10, 2012 · 0e2bb02 · 0e2bb02
1 parent 392af25
commit 0e2bb02
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java
@@ -220,8 +220,7 @@ public void write(CsvData data) {
 
     protected void checkForEarlyCommit() {
         if (uncommittedCount >= writerSettings.getMaxRowsBeforeCommit()) {
-            notifyFiltersEarlyCommit();
-            commit();
+            commit(true);
             /*
              * Chances are if SymmetricDS is configured to commit early in a
              * batch we want to give other threads a chance to do work and
@@ -236,12 +235,16 @@ protected void checkForEarlyCommit() {
         }
     }
 
-    protected void commit() {
+    protected void commit(boolean earlyCommit) {
         if (transaction != null) {
             try {
                 statistics.get(batch).startTimer(DataWriterStatisticConstants.DATABASEMILLIS);
                 this.transaction.commit();
-                notifyFiltersBatchCommitted();
+                if (!earlyCommit) {
+                   notifyFiltersBatchCommitted();
+                } else {
+                    notifyFiltersEarlyCommit();
+                }
             } finally {
                 statistics.get(batch).stopTimer(DataWriterStatisticConstants.DATABASEMILLIS);
             }
@@ -999,7 +1002,7 @@ public void end(Batch batch, boolean inError) {
         }
         if (!inError) {
             notifyFiltersBatchComplete();
-            commit();
+            commit(false);
         } else {
             rollback();
         }