0002281: Ignore batch causes sync to get stuck on a channel

JumpMind · Apr 23, 2015 · 92518ed · 92518ed
1 parent c59ffc2
commit 92518ed
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java
@@ -84,10 +84,11 @@ public BatchAckResult ack(final BatchAck batch) {
                 } else {
                     // clearing the error flag in case the user set the batch
                     // status to OK
+                    Status oldStatus = outgoingBatch.getStatus();
+                    outgoingBatch.setStatus(Status.OK);
                     outgoingBatch.setErrorFlag(false);
-                    log.info("Batch {} was already set to {}.  Not updating the status to {}",
-                            new Object[] { batch.getBatchId(), outgoingBatch.getStatus().name(),
-                                    status.name() });
+                    log.info("Batch {} for {} was set to {}.  Updating the status to OK",
+                            new Object[] { batch.getBatchId(), batch.getNodeId(), oldStatus.name() });
                 }
                 if (batch.isIgnored()) {
                     outgoingBatch.incrementIgnoreCount();