0001491: Mark outgoing batches as OK during the start of an initial l…

…oad can hanging until the config channel has been pulled
JumpMind · Dec 17, 2013 · e4c35d2 · e4c35d2
1 parent 1e16905
commit e4c35d2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
@@ -87,7 +87,9 @@ public OutgoingBatchService(IParameterService parameterService,
 
     public void markAllAsSentForNode(String nodeId, boolean includeConfigChannel) {
         OutgoingBatches batches = null;
+        int configCount;
         do {
+            configCount = 0;
             batches = getOutgoingBatches(nodeId, true);
             List<OutgoingBatch> list = batches.getBatches();
             /*
@@ -100,14 +102,17 @@ public int compare(OutgoingBatch o1, OutgoingBatch o2) {
                     return -new Long(o1.getBatchId()).compareTo(o2.getBatchId());
                 }
             });
-            for (OutgoingBatch outgoingBatch : batches.getBatches()) {
+
+            for (OutgoingBatch outgoingBatch : list) {
                 if (includeConfigChannel || !outgoingBatch.getChannelId().equals(Constants.CHANNEL_CONFIG)) {
                     outgoingBatch.setStatus(Status.OK);
                     outgoingBatch.setErrorFlag(false);
                     updateOutgoingBatch(outgoingBatch);
+                } else {
+                    configCount++;
                 }
             }
-        } while (batches.getBatches().size() > 0);
+        } while (batches.getBatches().size() > configCount);
     }
 
     public void updateAbandonedRoutingBatches() {