Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.8
JumpMind · Nov 4, 2017 · e7f669f · e7f669f
2 parents 831ae99 + ca77fa8
commit e7f669f
Showing 1 changed file with 1 addition and 1 deletion.
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
@@ -165,8 +165,8 @@ public void markAllChannelAsSent(String channelId, String tableName) {
             elgibleBatches = sqlTemplateDirty.query(sql, new Object[] { channelId, "OK" });
         }
 
-        String updateSql = getSql("cancelChannelBatchSql");
         if (elgibleBatches != null) {
+            String updateSql = getSql("cancelChannelBatchSql");
             for (Row elgibleBatch : elgibleBatches) {
                 String nodeId = elgibleBatch.getString("node_id");
                 long batchId = elgibleBatch.getLong("batch_id");