From fa73aa0575f97205255d66ffed45d64bc04434ed Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 08 Aug 2013 15:16:13 +0000
Subject: [PATCH] ReplicationServerDomain.java: Changed getCount() return type from int to long (This change goes along with r9386). Extracted method addUpdate(), isDifferentGenerationId(), isSameGenerationId(), collectRSsEligibleForAssuredReplication(), toRSInfo(). In many places, renamed sid to serverId. Various cleanups: - converted comments to javadoc - added curly braces around if bodies - collapsed if statements - used interfaces instead of concrete classes - removed useless parentheses - removed useless 'this' qualifier in non static method calls - put code on one line where it fits
---
opends/src/server/org/opends/server/replication/server/MessageHandler.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/MessageHandler.java b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
index 6813d54..626c08b 100644
--- a/opends/src/server/org/opends/server/replication/server/MessageHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -140,9 +140,8 @@
*
* @param update The update that must be added to the list of updates of
* this handler.
- * @param sourceHandler The source handler that generated the update.
*/
- public void add(UpdateMsg update, MessageHandler sourceHandler)
+ public void add(UpdateMsg update)
{
synchronized (msgQueue)
{
@@ -445,15 +444,13 @@
{
if (following)
{
- if (msgQueue.isEmpty())
- {
- result = null;
- } else
+ if (!msgQueue.isEmpty())
{
UpdateMsg msg = msgQueue.first();
result = msg.getChangeNumber();
}
- } else
+ }
+ else
{
if (lateQueue.isEmpty())
{
--
Gitblit v1.10.0