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/test/java/org/opends/server/replication/server/ReplicationServerTest.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
index c859386..beb53ae 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/ReplicationServerTest.java
@@ -611,7 +611,9 @@
for (BrokerReader r : reader)
{
if (r != null)
+ {
assertNull(r.errDetails, r.exc + " " + r.errDetails);
+ }
}
}
debugInfo("Ending multipleWriterMultipleReader");
@@ -841,9 +843,13 @@
{
ReplicationMsg msg = broker2.receive();
if (msg == null)
+ {
break;
+ }
if (msg instanceof TopologyMsg)
+ {
continue; // ignore
+ }
msgs.add(msg);
broker2.updateWindowAfterReplay();
@@ -1020,7 +1026,9 @@
// may prevent to process a WindowMsg that would unblock the dual
// writer thread.
if (msg == null)
+ {
break;
+ }
}
} catch (SocketTimeoutException e)
{
@@ -1077,7 +1085,9 @@
broker.publish(msg);
if ((count % 10) == 0)
- debugInfo("writer " + broker.getServerId() + " to send="+count);
+ {
+ debugInfo("writer " + broker.getServerId() + " to send="+count);
+ }
}
debugInfo("writer " + broker.getServerId() + " ends sent="+ccount);
}
@@ -1127,7 +1137,9 @@
// Connect only replicationServer[0] to ReplicationServer[1]
// and not the other way
if (i==0)
+ {
servers.add("localhost:" + changelogPorts[1]);
+ }
ReplServerFakeConfiguration conf =
new ReplServerFakeConfiguration(changelogPorts[i], "replicationServerTestReplicationServerConnectedDb"+i, replicationDbImplementation,
0, changelogIds[i], 0, 100, servers);
--
Gitblit v1.10.0