0001921: While sending a batch, if a batch is set to IG and an error …

…occurs, then the batch gets set to ER and the IG status is ignored
JumpMind · Aug 16, 2014 · f28f5ab · f28f5ab
1 parent 9d9d4b9
commit f28f5ab
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -542,6 +542,9 @@ protected List<OutgoingBatch> extract(ProcessInfo processInfo, Node targetNode,
             } catch (RuntimeException e) {
                 SQLException se = unwrapSqlException(e);
                 if (currentBatch != null) {
+                    /* Reread batch in case the ignore flag has been set */
+                    currentBatch = outgoingBatchService.
+                            findOutgoingBatch(currentBatch.getBatchId(), currentBatch.getNodeId());
                     statisticManager.incrementDataExtractedErrors(currentBatch.getChannelId(), 1);
                     if (se != null) {
                         currentBatch.setSqlState(se.getSQLState());
@@ -551,10 +554,11 @@ protected List<OutgoingBatch> extract(ProcessInfo processInfo, Node targetNode,
                         currentBatch.setSqlMessage(getRootMessage(e));
                     }
                     currentBatch.revertStatsOnError();
-                    if (currentBatch.getStatus() != Status.IG) {
+                    if (currentBatch.getStatus() != Status.IG &&
+                            currentBatch.getStatus() != Status.OK) {
                         currentBatch.setStatus(Status.ER);
+                        currentBatch.setErrorFlag(true);
                     }
-                    currentBatch.setErrorFlag(true);
                     outgoingBatchService.updateOutgoingBatch(currentBatch);
 
                     if (isStreamClosedByClient(e)) {