From fbe4cc6529bce784911abfac4ca35043f86a6141 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 15 Apr 2014 14:08:31 +0000
Subject: [PATCH] OPENDJ-1430 - Some changes are missing from the external changelog
---
opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java | 50 ++++++++++++++------------------------------------
1 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
index aac9cbd..1a49391 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.protocol;
@@ -121,9 +121,7 @@
return msg;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ModifyOperation createOperation(InternalClientConnection connection,
DN newDN) throws LDAPException, ASN1Exception, DataFormatException
@@ -142,43 +140,29 @@
return mod;
}
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
- if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V1)
{
return "ModifyMsg content: " +
" protocolVersion: " + protocolVersion +
" dn: " + dn +
- " changeNumber: " + csn +
- " uniqueId: " + entryUUID +
- " assuredFlag: " + assuredFlag;
- }
- if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2)
- {
- return "ModifyMsg content: " +
- " protocolVersion: " + protocolVersion +
- " dn: " + dn +
- " changeNumber: " + csn +
+ " csn: " + csn +
" uniqueId: " + entryUUID +
" assuredFlag: " + assuredFlag +
- " assuredMode: " + assuredMode +
- " safeDataLevel: " + safeDataLevel +
- " size: " + encodedMods.length;
+ (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2 ?
+ " assuredMode: " + assuredMode +
+ " safeDataLevel: " + safeDataLevel +
+ " size: " + encodedMods.length
+ : "");
/* Do not append mods, they can be too long */
-
-
}
return "!!! Unknown version: " + protocolVersion + "!!!";
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int size()
{
@@ -192,9 +176,7 @@
// Msg Encoding
// ============
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V1() throws UnsupportedEncodingException
{
@@ -209,9 +191,7 @@
return encodedMsg;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V23() throws UnsupportedEncodingException
{
@@ -228,9 +208,7 @@
return encodedMsg;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V45(short reqProtocolVersion)
throws UnsupportedEncodingException
--
Gitblit v1.10.0