From a9de78850918773fda3a7c6fbd2c237529e39208 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 30 Apr 2014 12:59:14 +0000
Subject: [PATCH] OPENDJ-1430 Some changes are missing from the external changelog
---
opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java
index 914af11..187227f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -167,9 +167,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public AddOperation createOperation(
InternalClientConnection connection, DN newDN)
@@ -190,9 +188,7 @@
// Msg encoding
// ============
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V1() throws UnsupportedEncodingException
{
@@ -226,9 +222,7 @@
return resultByteArray;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V23() throws UnsupportedEncodingException
{
@@ -267,9 +261,7 @@
return resultByteArray;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes_V45(short reqProtocolVersion)
throws UnsupportedEncodingException
@@ -334,32 +326,11 @@
{
builder.add(s);
}
- Attribute attr = builder.toAttribute();
+ new LDAPAttribute(builder.toAttribute()).write(writer);
- new LDAPAttribute(attr).write(writer);
-
- // Encode the user attributes (AttributeList).
- for (List<Attribute> list : userAttributes.values())
- {
- for (Attribute a : list)
- {
- if (!EntryHistorical.isHistoricalAttribute(a) && !a.isVirtual())
- {
- new LDAPAttribute(a).write(writer);
- }
- }
- }
-
- // Encode the operational attributes (AttributeList).
- for (List<Attribute> list : operationalAttributes.values())
- {
- for (Attribute a : list)
- {
- if (!EntryHistorical.isHistoricalAttribute(a))
- if (!a.isVirtual())
- new LDAPAttribute(a).write(writer);
- }
- }
+ // Encode the user and operational attributes (AttributeList).
+ encodeAttributes(userAttributes, writer);
+ encodeAttributes(operationalAttributes, writer);
}
catch(Exception e)
{
@@ -370,6 +341,21 @@
return byteBuilder.toByteArray();
}
+ private void encodeAttributes(Map<AttributeType, List<Attribute>> attributes,
+ ASN1Writer writer) throws Exception
+ {
+ for (List<Attribute> list : attributes.values())
+ {
+ for (Attribute a : list)
+ {
+ if (!a.isVirtual() && !EntryHistorical.isHistoricalAttribute(a))
+ {
+ new LDAPAttribute(a).write(writer);
+ }
+ }
+ }
+ }
+
private byte[] encodeAttributes(
Attribute objectClass,
Collection<Attribute> userAttributes,
@@ -484,31 +470,22 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
- if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
+ if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V1)
{
return "AddMsg content: " +
" protocolVersion: " + protocolVersion +
" dn: " + dn +
- " changeNumber: " + csn +
- " uniqueId: " + entryUUID +
- " assuredFlag: " + assuredFlag;
- }
- if (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V2)
- {
- return "AddMsg 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 + "!!!";
}
@@ -570,9 +547,7 @@
return parentEntryUUID;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int size()
{
--
Gitblit v1.10.0