From 31a2b4de7c2bba112bea52ae5e23372c9167006f Mon Sep 17 00:00:00 2001 From: eegeek Date: Thu, 10 Sep 2009 21:28:24 +0000 Subject: [PATCH] updates --- .../symmetric/service/impl/DataExtractorService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java index 39d0c36f87..d0de4ed8e7 100644 --- a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java +++ b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java @@ -291,12 +291,17 @@ public boolean extract(Node node, IOutgoingTransport targetTransport) throws IOE routingService.routeData(); } + // possibly here we should do "are there any outgoing batches to send even?" + // to avoid an un-needed reservation & to consolidate the logic List batches = outgoingBatchService.getOutgoingBatches(node.getNodeId()); if (batches != null && batches.size() > 0) { - + // reserve here.... + // + // based on results, filter all AND my local getNodeChannel()! + // if locals aren't ready to send, filter 'em out // batches.get(0).setStatus(status) FileOutgoingTransport fileTransport = null; @@ -316,6 +321,8 @@ public boolean extract(Node node, IOutgoingTransport targetTransport) throws IOE networkTransfer(fileTransport, targetTransport); + // sent channels need timestamps updated... + // batch.setStatus(OutgoingBatch.Status.SE); for IGNORED // outgoingBatchService.updateOutgoingBatch(batch);