From 7c3cd18d9546c9243979504243538a6c75619bbe Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 17 Aug 2015 08:38:24 +0000
Subject: [PATCH] Fix incorrect error message in replication
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
index 42127db..fb8b3f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
@@ -26,9 +26,9 @@
*/
package org.opends.server.replication.server;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.TreeMap;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -41,7 +41,6 @@
*/
public class MsgQueue
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private TreeMap<CSN, UpdateMsg> map = new TreeMap<>();
@@ -109,7 +108,6 @@
}
}
-
/**
* Add an UpdateMsg to this MessageQueue.
*
@@ -128,10 +126,9 @@
|| msgSameCSN.isAssured() != update.isAssured()
|| msgSameCSN.getVersion() != update.getVersion())
{
- // Adding 2 msgs with the same CSN is ok only when
- // the 2 msgs are the same
+ // Adding 2 msgs with the same CSN is ok only when the 2 msgs are the same
bytesCount += update.size() - msgSameCSN.size();
- logger.error(ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN, msgSameCSN.getCSN(), msgSameCSN, update);
+ logger.error(ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CSN, msgSameCSN.getCSN(), msgSameCSN, update);
}
}
catch (Exception e)
@@ -179,7 +176,6 @@
*
* @return <tt>true</tt> if this map contains an UpdateMsg
* with the same CSN as the given UpdateMsg.
- *
*/
public boolean contains(UpdateMsg msg)
{
@@ -189,9 +185,7 @@
}
}
- /**
- * Removes all UpdateMsg form this queue.
- */
+ /** Removes all UpdateMsg form this queue. */
public void clear()
{
synchronized (lock)
@@ -228,11 +222,9 @@
while (!finalCSN.equals(msg.getCSN()));
}
- /** {@inheritDoc} */
@Override
public String toString()
{
- return getClass().getSimpleName() + " bytesCount=" + bytesCount + " queue="
- + map.values();
+ return getClass().getSimpleName() + " bytesCount=" + bytesCount + " queue=" + map.values();
}
}
--
Gitblit v1.10.0