From 5870b2934358b3a613084ccafa5eecb2e4ac00f4 Mon Sep 17 00:00:00 2001
From: evan-miller-jumpmind
 <70151986+evan-miller-jumpmind@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:54:11 -0400
Subject: [PATCH] 0006071: Prevented sym_node from getting updated
 unnecessarily when heartbeat.update.node.with.batch.status parameter is
 disabled

---
 .../symmetric/job/PushHeartbeatListener.java  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java
index 77d8b65fb5..bb7fae3fbc 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java
@@ -119,17 +119,17 @@ public void heartbeat(Node me) {
                     || (engine.getParameterService().isRegistrationServer() && !Version.version().equals(me.getConfigVersion()))
                     || !symmetricDialect.getName().equals(me.getDatabaseType())
                     || !symmetricDialect.getVersion().equals(me.getDatabaseVersion())
-                    || me.getBatchInErrorCount() != batchInErrorCount
-                    || me.getBatchToSendCount() != outgoingUnsentCount
-                    || me.getLastSuccessfulSyncDate() != lastSuccessfulSyncTime
-                    || me.getMostRecentActiveTableSynced() != mostRecentActiveTableSynced
-                    || me.getPurgeOutgoingLastMs() != purgeOutgoingLastMs
-                    || me.getPurgeOutgoingLastRun() != purgeOutgoingLastRun
-                    || me.getPurgeOutgoingAverageMs() != purgeOutgoingAverage
-                    || me.getRoutingAverageMs() != routingAveragetMs
-                    || me.getRoutingLastRun() != routingLastRun
-                    || me.getRoutingLastMs() != routingLastMs
-                    || me.getSymDataSize() != symDataSize) {
+                    || (updateWithBatchStatus && (me.getBatchInErrorCount() != batchInErrorCount
+                            || me.getBatchToSendCount() != outgoingUnsentCount
+                            || me.getLastSuccessfulSyncDate() != lastSuccessfulSyncTime
+                            || me.getMostRecentActiveTableSynced() != mostRecentActiveTableSynced
+                            || me.getPurgeOutgoingLastMs() != purgeOutgoingLastMs
+                            || me.getPurgeOutgoingLastRun() != purgeOutgoingLastRun
+                            || me.getPurgeOutgoingAverageMs() != purgeOutgoingAverage
+                            || me.getRoutingAverageMs() != routingAveragetMs
+                            || me.getRoutingLastRun() != routingLastRun
+                            || me.getRoutingLastMs() != routingLastMs
+                            || me.getSymDataSize() != symDataSize))) {
                 log.info("Some attribute(s) of node changed.  Recording changes");
                 me.setDeploymentType(engine.getDeploymentType());
                 me.setDeploymentSubType(engine.getDeploymentSubType());