0002769: Initial load extraction gets into a loop if staging file was

deleted before being sent.
JumpMind · Sep 6, 2016 · 001fcfe · 001fcfe
1 parent ffa5cf0
commit 001fcfe
Show file tree

Hide file tree

Showing 2 changed files with 2 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
@@ -1179,7 +1179,7 @@ public List<ExtractRequest> getExtractRequestsForNode(NodeCommunication nodeComm
 
     protected void resetExtractRequest(OutgoingBatch batch) {
         sqlTemplate.update(getSql("resetExtractRequestStatus"), ExtractStatus.NE.name(),
-                batch.getBatchId(), batch.getBatchId(), batch.getNodeId(), batch.getChannelId());
+                batch.getBatchId(), batch.getBatchId(), batch.getNodeId());
     }
 
     public void requestExtractRequest(ISqlTransaction transaction, String nodeId, String queue,

diff --git a/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceSqlMap.java b/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorServiceSqlMap.java
@@ -39,7 +39,7 @@ public DataExtractorServiceSqlMap(IDatabasePlatform platform,
 
         putSql("updateExtractRequestStatus", "update $(extract_request) set status=? where request_id=?");
 
-        putSql("resetExtractRequestStatus", "update $(extract_request) set status=? where start_batch_id <= ? and end_batch_id >= ? and node_id=? and queue=?");
+        putSql("resetExtractRequestStatus", "update $(extract_request) set status=? where start_batch_id <= ? and end_batch_id >= ? and node_id=?");
     }
 
 }