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/DeleteMsg.java | 48 ++++++++++++++----------------------------------
1 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java b/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
index 8237156..098cd4e 100644
--- a/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/DeleteMsg.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;
@@ -105,10 +105,7 @@
}
}
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public DeleteOperation createOperation(InternalClientConnection connection,
DN newDN)
@@ -129,18 +126,14 @@
// Msg encoding
// ============
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V1() throws UnsupportedEncodingException
{
return encodeHeader_V1(MSG_TYPE_DELETE_V1, 0);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V23() throws UnsupportedEncodingException
{
@@ -148,9 +141,7 @@
ProtocolVersion.REPLICATION_PROTOCOL_V3);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V45(short reqProtocolVersion)
throws UnsupportedEncodingException
@@ -187,7 +178,7 @@
pos = addByteArray(byteEntryAttrLen, encodedMsg, pos);
pos = addByteArray(encodedEclIncludes, encodedMsg, pos);
- encodedMsg[pos++] = (isSubtreeDelete ? (byte) 1 : (byte) 0);
+ encodedMsg[pos++] = (byte) (isSubtreeDelete ? 1 : 0);
return encodedMsg;
}
@@ -241,38 +232,27 @@
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
- if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V1)
{
return "DeleteMsg content: " +
" protocolVersion: " + protocolVersion +
" dn: " + dn +
- " changeNumber: " + csn +
- " uniqueId: " + entryUUID +
- " assuredFlag: " + assuredFlag;
- }
- if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2)
- {
- return "DeleteMsg content: " +
- " protocolVersion: " + protocolVersion +
- " dn: " + dn +
- " changeNumber: " + csn +
+ " csn: " + csn +
" uniqueId: " + entryUUID +
" assuredFlag: " + assuredFlag +
- " assuredMode: " + assuredMode +
- " safeDataLevel: " + safeDataLevel;
+ (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2 ?
+ " assuredMode: " + assuredMode +
+ " safeDataLevel: " + safeDataLevel
+ : "");
}
return "!!! Unknown version: " + protocolVersion + "!!!";
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int size()
{
--
Gitblit v1.10.0