Merge remote-tracking branch 'origin/3.10' into 3.11

JumpMind · Dec 5, 2019 · da9809c · da9809c
2 parents 91c5ad1 + 2425afa
commit da9809c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationService.java
@@ -50,6 +50,7 @@
 import org.jumpmind.symmetric.model.NodeCommunication;
 import org.jumpmind.symmetric.model.NodeCommunication.CommunicationType;
 import org.jumpmind.symmetric.model.NodeGroupLinkAction;
+import org.jumpmind.symmetric.model.OutgoingBatch;
 import org.jumpmind.symmetric.model.RemoteNodeStatus;
 import org.jumpmind.symmetric.model.RemoteNodeStatuses;
 import org.jumpmind.symmetric.service.IClusterService;
@@ -250,7 +251,8 @@ public List<NodeCommunication> list(CommunicationType communicationType) {
 
     protected List<String> getNodeIdsWithUnsentCount() {
         return sqlTemplate.query(getSql("selectNodeIdsWithUnsentBatchsSql"),
-                new StringMapper());        
+                new StringMapper(), OutgoingBatch.Status.ER, OutgoingBatch.Status.NE, OutgoingBatch.Status.QY,
+                OutgoingBatch.Status.SE, OutgoingBatch.Status.LD, OutgoingBatch.Status.IG, OutgoingBatch.Status.RS);
     }
 
     protected List<NodeCommunication> filterForChannelThreading(List<Node> nodesToCommunicateWith) {

diff --git a/...ore/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java b/...ore/src/main/java/org/jumpmind/symmetric/service/impl/NodeCommunicationServiceSqlMap.java
@@ -34,7 +34,7 @@ public NodeCommunicationServiceSqlMap(IDatabasePlatform platform,
 
         putSql("clearLocksOnRestartSql", "update $(node_communication) set lock_time=null where locking_server_id=? and lock_time is not null");
 
-        putSql("selectNodeIdsWithUnsentBatchsSql", "select distinct(node_id) from $(outgoing_batch) where status <> 'OK'");
+        putSql("selectNodeIdsWithUnsentBatchsSql", "select distinct(node_id) from $(outgoing_batch) where status in (?,?,?,?,?,?,?)");
 
         putSql("selectNodeCommunicationSql",
                 "select * from $(node_communication) where communication_type=? order by node_priority DESC,last_lock_time");

diff --git a/...in/java/org/jumpmind/symmetric/io/data/writer/AbstractDatabaseWriterConflictResolver.java b/...in/java/org/jumpmind/symmetric/io/data/writer/AbstractDatabaseWriterConflictResolver.java
@@ -202,7 +202,8 @@ public void needsResolved(AbstractDatabaseWriter writer, CsvData data, LoadStatu
             default:
                 break;
         }
-
+
+        writer.getContext().setLastError(null);
         logConflictResolution(conflict, data, writer, resolvedData, lineNumber);
     }