0002289: When a node is removed, clear out its sym_incoming_batch tab…

…le (versus just setting batches to OK)
JumpMind · Apr 30, 2015 · 6782274 · 6782274
1 parent a1039b3
commit 6782274
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/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -253,7 +253,7 @@ public void deleteNode(String nodeId, boolean syncChange) {
                 transaction.prepareAndExecute(getSql("deleteNodeCommunicationSql"), new Object[] { nodeId });
                 transaction.prepareAndExecute(getSql("deleteTableReloadRequestSql"), new Object[] { nodeId, nodeId });
                 transaction.prepareAndExecute(getSql("setOutgoingBatchOkSql"), new Object[] { nodeId });
-                transaction.prepareAndExecute(getSql("setIncomingBatchOkSql"), new Object[] { nodeId });
+                transaction.prepareAndExecute(getSql("deleteIncomingBatchSql"), new Object[] { nodeId });
             }
         } catch (Error ex) {
             if (transaction != null) {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java
@@ -117,7 +117,7 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map<String, String> replace
 
         putSql("setOutgoingBatchOkSql", "update $(outgoing_batch) set status='OK', error_flag=0 where node_id = ?");
 
-        putSql("setIncomingBatchOkSql", "update $(incoming_batch) set status='OK', error_flag=0 where node_id = ?");
+        putSql("deleteIncomingBatchSql", "delete from $(incoming_batch) where node_id = ?");
 
         putSql("findNodeIdentitySql", "inner join $(node_identity) i on c.node_id =   "
                 + "  i.node_id                                          ");