From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
index 351a15e..a9fcdb8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
@@ -107,16 +107,14 @@
"was sent at %d", now, session.getLastPublishTime());
}
- if (now > session.getLastPublishTime() + heartbeatInterval)
+ if (now > session.getLastPublishTime() + heartbeatInterval
+ && !heartbeatsDisabled)
{
- if (!heartbeatsDisabled)
+ if (logger.isTraceEnabled())
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Heartbeat sent at %d", now);
- }
- session.publish(heartbeatMessage);
+ logger.trace("Heartbeat sent at %d", now);
}
+ session.publish(heartbeatMessage);
}
long sleepTime = session.getLastPublishTime() + heartbeatInterval - now;
--
Gitblit v1.10.0