From 0243452b5c630c74fa462e9a91fb10db9a9867f7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 05 Aug 2013 09:47:44 +0000
Subject: [PATCH] Minor code cleanup.
---
opends/src/server/org/opends/server/replication/server/MsgQueue.java | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/MsgQueue.java b/opends/src/server/org/opends/server/replication/server/MsgQueue.java
index 2e42b49..17e7c54 100644
--- a/opends/src/server/org/opends/server/replication/server/MsgQueue.java
+++ b/opends/src/server/org/opends/server/replication/server/MsgQueue.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.opends.server.replication.server;
@@ -116,29 +116,20 @@
UpdateMsg msgSameChangeNumber = map.put(update.getChangeNumber(), update);
if (msgSameChangeNumber != null)
{
- boolean sameMsgs = false;
try
{
- if (
- (msgSameChangeNumber.getBytes().length == update.getBytes().length)
- && (msgSameChangeNumber.isAssured() == update.isAssured())
- && (msgSameChangeNumber.getVersion() == update.getVersion()) )
- {
- sameMsgs = true;
- }
-
-
- if (!sameMsgs)
- {
- // Adding 2 msgs with the same ChangeNumber is ok only when
- // the 2 masgs are the same
- bytesCount += (update.size() - msgSameChangeNumber.size());
- Message errMsg = ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
- msgSameChangeNumber.getChangeNumber().toString(),
- msgSameChangeNumber.toString(),
- update.toString());
- logError(errMsg);
- }
+ if (msgSameChangeNumber.getBytes().length != update.getBytes().length
+ || msgSameChangeNumber.isAssured() != update.isAssured()
+ || msgSameChangeNumber.getVersion() != update.getVersion())
+ {
+ // Adding 2 msgs with the same ChangeNumber is ok only when
+ // the 2 msgs are the same
+ bytesCount += (update.size() - msgSameChangeNumber.size());
+ Message errMsg = ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
+ msgSameChangeNumber.getChangeNumber().toString(),
+ msgSameChangeNumber.toString(), update.toString());
+ logError(errMsg);
+ }
}
catch(Exception e)
{}
--
Gitblit v1.10.0