0001392: When initial.load.use.extract.job.enabled is set to true the…

… byte count and data count aren't being captured 0001393: Setting a batch to status of IG causes exception when initial.load.use.extract.job.enabled is set to true
JumpMind · Aug 20, 2013 · 1fbae37 · 1fbae37
1 parent 1facc1e
commit 1fbae37
Showing 1 changed file with 3 additions and 3 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
@@ -466,7 +466,7 @@ protected List<OutgoingBatch> extract(ProcessInfo processInfo, Node targetNode,
 
                     currentBatch = requeryIfEnoughTimeHasPassed(batchesSelectedAtMs, currentBatch);
 
-                    if (currentBatch.isExtractJobFlag()) {
+                    if (currentBatch.isExtractJobFlag() && currentBatch.getStatus() != Status.IG) {
                         if (parameterService.is(ParameterConstants.INTITAL_LOAD_USE_EXTRACT_JOB)) {
                             if (currentBatch.getStatus() != Status.RQ && currentBatch.getStatus() != Status.IG
                                     && !isPreviouslyExtracted(currentBatch)) {
@@ -1022,14 +1022,14 @@ public void execute(NodeCommunication nodeCommunication, RemoteNodeStatus status
                 }
 
                 // re-query the batches to see if they have been OK'd while extracting
-                batches = outgoingBatchService.getOutgoingBatchRange(
+                List<OutgoingBatch> checkBatches = outgoingBatchService.getOutgoingBatchRange(
                         request.getStartBatchId(), request.getEndBatchId()).getBatches();
 
                 areBatchesOk = true;
 
                 // check to see if batches have been OK'd by another reload request
                 // while extracting
-                for (OutgoingBatch outgoingBatch : batches) {
+                for (OutgoingBatch outgoingBatch : checkBatches) {
                     if (outgoingBatch.getStatus() != Status.OK) {
                         areBatchesOk = false;
                     }