From b8c6b80da1cb6118167a934daa480eb381c59e0e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 08:06:00 +0000
Subject: [PATCH] opendj-server-legacy maven module: Enabled "NeedBraces" checkstyle rule. This brings opendj-server-legacy's checkstyle rules closer to ForgeRock's checkstyle rules.
---
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
index 48456a0..ed2c87c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
@@ -759,8 +759,9 @@
* out which one is the best to connect to.
*/
if (logger.isTraceEnabled())
- debugInfo("phase 1 : will perform PhaseOneH with each RS in order to "
- + "elect the preferred one");
+ {
+ debugInfo("phase 1 : will perform PhaseOneH with each RS in order to elect the preferred one");
+ }
// Get info from every available replication servers
Map<Integer, ReplicationServerInfo> rsInfos =
@@ -779,8 +780,9 @@
// Best found, now initialize connection to this one (handshake phase 1)
if (logger.isTraceEnabled())
- debugInfo("phase 2 : will perform PhaseOneH with the preferred RS="
- + evals.getBestRS());
+ {
+ debugInfo("phase 2 : will perform PhaseOneH with the preferred RS=" + evals.getBestRS());
+ }
final ConnectedRS electedRS = performPhaseOneHandshake(
evals.getBestRS().getServerURL(), true);
@@ -1584,7 +1586,9 @@
{
eval.accept(rsId, rsInfo);
if (!rsInfo.serverState.isEmpty())
+ {
emptyState = false;
+ }
}
else if (rsInfo.getGenerationId() == -1)
{
@@ -2548,8 +2552,9 @@
}
logger.info(message);
if (logger.isTraceEnabled())
- debugInfo("best replication servers evaluation results: "
- + evals);
+ {
+ debugInfo("best replication servers evaluation results: " + evals);
+ }
reStart(true);
}
@@ -2656,8 +2661,9 @@
public void stop()
{
if (logger.isTraceEnabled())
- debugInfo("is stopping and will close the connection to RS("
- + getRsServerId() + ")");
+ {
+ debugInfo("is stopping and will close the connection to RS(" + getRsServerId() + ")");
+ }
synchronized (startStopLock)
{
@@ -3204,7 +3210,9 @@
else
{
if (logger.isTraceEnabled())
+ {
debugInfo("is not configured to send CSN heartbeat interval");
+ }
}
}
--
Gitblit v1.10.0